Index: lams_central/web/includes/javascript/openUrls.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v diff -u -r1.38.2.3 -r1.38.2.4 --- lams_central/web/includes/javascript/openUrls.js 17 Dec 2014 12:57:34 -0000 1.38.2.3 +++ lams_central/web/includes/javascript/openUrls.js 2 Sep 2015 13:02:43 -0000 1.38.2.4 @@ -52,13 +52,13 @@ function openAuthor() { if (isMac) { - authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); + authorWin = window.open('home.do?method=authorFlash','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); } else { if(authorWin && !authorWin.closed && authorWin.location.pathname.indexOf('home.do?method=author') > -1) { //authorWin.location = 'home.do?method=author'; authorWin.focus(); } else { - authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); + authorWin = window.open('home.do?method=authorFlash','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); authorWin.focus(); } } @@ -76,24 +76,7 @@ } } } - - function openAuthorForEditOnFly( learningDesignID ) { - if (isMac) { - monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); - } else { - if(monitorLessonWin && !monitorLessonWin.closed) { - monitorLessonWin.location = '../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID; - } else { - monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow', 'width=' + authoring_width + ',height=' + authoring_height + ',resizable'); - monitorLessonWin.focus(); - } - } - } - function openAuthorForEditOnFlyIntegrated( learningDesignID ) { - window.location = '../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID; - } - function returnToMonitorLessonIntegrated( lessonID ) { window.location = 'home.do?method=monitorLesson&lessonID='+lessonID; }