Merge branch 'm26_MDL-46961' of https://github.com/danmarsden/moodle …

…into MOODLE_26_STABLE
moodle · Sep 1, 2014 · dea12fe · dea12fe
2 parents bb5b3ee + 892eb5d
commit dea12fe
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/mod/scorm/view.js b/mod/scorm/view.js
@@ -64,6 +64,20 @@ M.mod_scormform.init = function(Y) {
             }}, 800);
     }
 
+    // Set mode and newattempt correctly.
+    var setlaunchoptions = function() {
+        var mode = Y.one('#scormviewform input[name=mode]:checked');
+        if (mode) {
+            var modevalue = mode.get('value');
+            launch_url += '&mode=' + (modevalue ? modevalue : 'normal');
+        } else {
+            launch_url += '&mode=normal';
+        }
+
+        var newattempt = Y.one('#scormviewform #a');
+        launch_url += (newattempt && newattempt.get('checked') ? '&newattempt=on' : '');
+    }
+
     if (launch == true) {
         setlaunchoptions();
         winobj = window.open(launch_url,'Popup', poptions);
@@ -80,17 +94,4 @@ M.mod_scormform.init = function(Y) {
             e.preventDefault();
         }, scormform);
     }
-
-    var setlaunchoptions = function() {
-        var mode = Y.one('#scormviewform input[name=mode]:checked');
-        if (mode) {
-            var modevalue = mode.get('value');
-            launch_url += '&mode=' + (modevalue ? modevalue : 'normal');
-        } else {
-            launch_url += '&mode=normal';
-        }
-
-        var newattempt = Y.one('#scormviewform #a');
-        launch_url += (newattempt && newattempt.get('checked') ? '&newattempt=on' : '');
-    }
 }