Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r74687b69d8a1c8053702395836a1a8a3180be02c -r35dd47046a83ab2f9e80f76dc22d1521412219b5 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 74687b69d8a1c8053702395836a1a8a3180be02c) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 35dd47046a83ab2f9e80f76dc22d1521412219b5) @@ -47,45 +47,16 @@ window.location = '/lams/home/monitorLesson.do?lessonID='+lessonID; } -function openMonitorLesson( lessonID, url, displayFullScreen ) { +function openMonitorLesson( lessonID, url ) { if (!url) { // change back to Home controller after upgrade!! url = '/lams/monitoring/monitoring/monitorLesson.do?'; } url += 'lessonID='+ lessonID; - - if (displayFullScreen) { - sessionStorage.removeItem("lamsMonitoringCurrentTab"); - window.location.href = url; - return; - } - - url += '&newUI=false'; - - if (isMac) { - if(belowMinRes) { - monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width - + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); - } else { - monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width - + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); - } - } else { - if (monitorLessonWin && !monitorLessonWin.closed) { - monitorLessonWin.location = url; - monitorLessonWin.focus(); - } else { - monitorLessonWin = window.open(url,'mWindow','width=' + monitor_width - + ',height=' + monitor_height + ',resizable,resizable,scrollbars' - + getCenterParams(monitor_width, monitor_height)); - } - } + sessionStorage.removeItem("lamsMonitoringCurrentTab"); + window.location.href = url; } -function openTBLMonitorLesson( lessonID ) { - openMonitorLesson(lessonID, '/lams/monitoring/tblmonitor/start.do?') -} - function openLearner( lessonId, url ) { if (!url) { url = '/lams/home/learner.do?';