Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384 -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) @@ -987,7 +987,11 @@ var uID = Config.getInstance().userID; var serverUrl = Config.getInstance().serverUrl; //Create an instance of JsPopup to access launchPopupWindow method. - JsPopup.getInstance().launchPopupWindow(serverUrl+'learning/main.jsp?userID='+uID+'&lessonID='+r+'&mode=preview', 'lWindow', 570, 796, true, true, false, false, false); + //JsPopup.getInstance().launchPopupWindow(serverUrl+'learning/main.jsp?userID='+uID+'&lessonID='+r+'&mode=preview', 'lWindow', 570, 796, true, true, false, false, false); + + // open preview in new window + fscommand("openPreview", r); + Debugger.log('Recieved Lesson ID: '+r ,Debugger.GEN,'onLaunchPreviewResponse','Canvas'); //_global.breakpoint(); //Debugger.log('_ddm.learningDesignID:'+_ddm.learningDesignID,Debugger.GEN,'onStoreDesignResponse','Canvas'); Index: lams_central/web/WEB-INF/tags/TabName.tag =================================================================== diff -u -r811748b2714c6207ae0cb3191cc225299c3918f0 -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 --- lams_central/web/WEB-INF/tags/TabName.tag (.../TabName.tag) (revision 811748b2714c6207ae0cb3191cc225299c3918f0) +++ lams_central/web/WEB-INF/tags/TabName.tag (.../TabName.tag) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) @@ -35,14 +35,14 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-function" prefix="fn"%> -10 +12 - + Index: lams_central/web/author.jsp =================================================================== diff -u -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384 -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 --- lams_central/web/author.jsp (.../author.jsp) (revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384) +++ lams_central/web/author.jsp (.../author.jsp) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) @@ -142,6 +142,10 @@ openPopUp(url, title, h, w, resize, status, scrollbar, menubar, toolbar); } +function openPreview(args){ + window.opener.openPreview(args); +} + function openURL(args){ window.open(args); } Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r2c37ffdee2c64d231b2c8ae6c2efa88a83d9938d -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 2c37ffdee2c64d231b2c8ae6c2efa88a83d9938d) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) @@ -9,6 +9,7 @@ var authorWin = null; var learnWin = null; + var previewWin = null; var monitorLessonWin = null; var addLessonWin = null; var epWin = null; @@ -20,6 +21,7 @@ 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(); @@ -143,6 +145,26 @@ } } + function openPreview( lessonId ) + { + if(isMac) + { + previewWin = window.open('home.do?method=learner&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + } + else + { + if(previewWin && !previewWin.closed ) + { + previewWin.location = 'home.do?method=learner&lessonID='+lessonId; + previewWin.focus(); + } + else + { + previewWin = window.open('home.do?method=learner&lessonID='+lessonId,'pWindow','width=796,height=570,resizable,status=yes'); + } + } + } + function openExportPortfolio( lessonId ) { if(isMac) Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r0569b06e02c842907f3dbc4e1912ba857acea176 -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r0569b06e02c842907f3dbc4e1912ba857acea176 -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 Binary files differ