Index: lams_central/web/author.jsp =================================================================== diff -u -r09d397307cdeb56f597caf45fde99302c4b541bd -r13a035519cbb0142c46ff9560e8cbbed118e2cc5 --- lams_central/web/author.jsp (.../author.jsp) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) +++ lams_central/web/author.jsp (.../author.jsp) (revision 13a035519cbb0142c46ff9560e8cbbed118e2cc5) @@ -40,6 +40,7 @@ var thePopUp = null; var theFilePopUp = null; +var previewWin = null; var previewSessionId = null; function getWindowSize() { @@ -143,9 +144,25 @@ openPopUp(url, title, h, w, resize, status, scrollbar, menubar, toolbar); } -function openPreview(args){ - window.opener.openPreview(args); -} +function openPreview( lessonId ) + { + if(mac) + { + previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + } + else + { + if(previewWin && !previewWin.closed ) + { + previewWin.location = 'home.do?method=learner&mode=preview&lessonID='+lessonId; + previewWin.focus(); + } + else + { + previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + } + } + } function openURL(args){ window.open(args); Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -re674ee8c8ff4d3d75456b57586d1ea5c090d55b9 -r13a035519cbb0142c46ff9560e8cbbed118e2cc5 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision e674ee8c8ff4d3d75456b57586d1ea5c090d55b9) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 13a035519cbb0142c46ff9560e8cbbed118e2cc5) @@ -9,7 +9,6 @@ var authorWin = null; var learnWin = null; - var previewWin = null; var monitorLessonWin = null; var addLessonWin = null; var epWin = null; @@ -21,7 +20,6 @@ function closeAllChildren(){ if (authorWin && !authorWin.closed) authorWin.close(); if (learnWin && !learnWin.closed) learnWin.close(); - if (previewWin && !previewWin.closed) previewWin.close(); if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.close(); if (addLessonWin && !addLessonWin.closed) addLessonWin.close(); if (epWin && !epWin.closed) epWin.close(); @@ -145,25 +143,6 @@ } } - function openPreview( lessonId ) - { - if(isMac) - { - previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); - } - else - { - if(previewWin && !previewWin.closed ) - { - previewWin.location = 'home.do?method=learner&mode=preview&lessonID='+lessonId; - previewWin.focus(); - } - else - { - previewWin = window.open('home.do?method=learner&mode=preview&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); - } - } - } function openExportPortfolio( lessonId ) {