mod-scorm MDL-16706 Removed inline JS and replaced with new PAGE methods

diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php
index be20df944e070c9d3a06dcf5abef25f180329b35..076e399c02a2403fb32e0c1f274c9e4a01b970a6 100644 (file)
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@ -107,7 +107,7 @@ function scorm_eval_prerequisites($prerequisites, $usertracks) {
 }
 
 function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) {
-    global $CFG, $DB;
+    global $CFG, $DB, $PAGE;
 
     $strexpand = get_string('expcoll','scorm');
     $modestr = '';
@@ -318,25 +318,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     }
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
-        $result->toc .= '
-          <script type="text/javascript">
-          //<![CDATA[
-              function expandCollide(which,list,item) {
-                                 var el = document.ids ? document.ids[list] : document.getElementById ? document.getElementById(list) : document.all[list];
-                  which = which.substring(0,(which.length));
-                                 var el2 = document.ids ? document.ids[which] : document.getElementById ? document.getElementById(which) : document.all[which];
-                  if (el.style.display != "none") {
-                      el2.src = "'.$scormpixdir.'/plus.gif";
-                      el.style.display=\'none\';
-                      new cookie("hide:SCORMitem" + item, 1, 356, "/").set();
-                  } else {
-                      el2.src = "'.$scormpixdir.'/minus.gif";
-                      el.style.display=\'block\';
-                      new cookie("hide:SCORMitem" + item, 1, -1, "/").set();
-                  }
-              }
-          //]]>
-          </script>'."\n";
+        $PAGE->requires->data_for_js('scormdata', Array('scormpixdir'=>$scormpixdir));
+        $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
     $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid=';

diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index 626358bfd39ab4e6f4f2c10d406c5b87ca159dc5..14dddb03903676c7ba29440e6f4f3f9b74492c82 100644 (file)
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -1,7 +1,7 @@
 <?php // $Id$
 
 function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='normal',$attempt='',$play=false) {
-    global $CFG, $DB;
+    global $CFG, $DB, $PAGE;
 
     $strexpand = get_string('expcoll','scorm');
     $modestr = '';
@@ -209,25 +209,8 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
     }
     $result->toc .= "\t</ul>\n";
     if ($scorm->hidetoc == 0) {
-        $result->toc .= '
-          <script type="text/javascript">
-          //<![CDATA[
-              function expandCollide(which,list,item) {
-                  var el = document.ids ? document.ids[list] : document.getElementById ? document.getElementById(list) : document.all[list];
-                  which = which.substring(0,(which.length));
-                  var el2 = document.ids ? document.ids[which] : document.getElementById ? document.getElementById(which) : document.all[which];
-                  if (el.style.display != "none") {
-                      el2.src = "'.$scormpixdir.'/plus.gif";
-                      el.style.display=\'none\';
-                      new cookie("hide:SCORMitem" + item, 1, 356, "/").set();
-                  } else {
-                      el2.src = "'.$scormpixdir.'/minus.gif";
-                      el.style.display=\'block\';
-                      new cookie("hide:SCORMitem" + item, 1, -1, "/").set();
-                  }
-              }
-          //]]>
-          </script>'."\n";
+        $PAGE->requires->data_for_js('scormdata', Array('scormpixdir'=>$scormpixdir));
+        $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js');
     }
 
     $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;currentorg='.$currentorg.$modestr.'&amp;scoid=';

diff --git a/mod/scorm/datamodels/scorm_datamodels.js b/mod/scorm/datamodels/scorm_datamodels.js
new file mode 100644 (file)
index 0000000..071c4c5
--- /dev/null
+++ b/mod/scorm/datamodels/scorm_datamodels.js
@@ -0,0 +1,14 @@
+function expandCollide(which,list,item) {
+    var el = document.ids ? document.ids[list] : document.getElementById ? document.getElementById(list) : document.all[list];
+    which = which.substring(0,(which.length));
+    var el2 = document.ids ? document.ids[which] : document.getElementById ? document.getElementById(which) : document.all[which];
+    if (el.style.display != "none") {
+        el2.src = scormdata.scormpixdir+"/plus.gif";
+        el.style.display='none';
+        new cookie("hide:SCORMitem" + item, 1, 356, "/").set();
+    } else {
+        el2.src = scormdata.scormpixdir+"/minus.gif";
+        el.style.display='block';
+        new cookie("hide:SCORMitem" + item, 1, -1, "/").set();
+    }
+}
\ No newline at end of file

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index b0a6091dbca829dfcf7d63f5a227833f4d02bbab..dd5a48dbb2adbed8a79109e5762c2e701f49f4bc 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -157,31 +157,24 @@
     print_header($pagetitle, $course->fullname,
                  $navigation,
                  '', '', true, $exitlink.update_module_button($cm->id, $course->id, $strscorm), '', false, $bodyscript);
-    //if ($sco->scormtype == 'sco') {
-?>
-    <script type="text/javascript" src="request.js"></script>
-    <script type="text/javascript" src="loaddatamodel.php?id=<?php echo $cm->id.$scoidstr.$modestr.$attemptstr ?>"></script>
-    <script type="text/javascript" src="<?php echo $CFG->wwwroot; ?>/mod/scorm/rd.js"></script>
-    <script type="text/javascript">
-    <!--
-        window.onresize = function() {
-            scorm_resize(<?php echo $scorm->width.", ".$scorm->height; ?>);
-        };
-    -->
-    </script>
-<?php
-    //}
+
+    echo $PAGE->requires->data_for_js('scormdata', Array('cwidth'=>$scorm->width,'cheight'=>$scorm->height))->asap();
+    echo $PAGE->requires->js('mod/scorm/request.js')->asap();
+    echo $PAGE->requires->js('mod/scorm/loaddatamodel.php?id='.$cm->id.$scoidstr.$modestr.$attemptstr)->asap();
+    echo $PAGE->requires->js('mod/scorm/rd.js')->asap();
+    $PAGE->requires->js_function_call('attach_resize_event');
+
     if (($sco->previd != 0) && ((!isset($sco->previous)) || ($sco->previous == 0))) {
         $scostr = '&scoid='.$sco->previd;
-        echo '    <script type="text/javascript">'."\n//<![CDATA[\n".'var prev="'.$CFG->wwwroot.'/mod/scorm/player.php?id='.$cm->id.$orgstr.$modepop.$scostr."\";\n//]]>\n</script>\n";
+        $PAGE->requires->js_function_call('scorm_set_prev', Array($CFG->wwwroot.'/mod/scorm/player.php?id='.$cm->id.$orgstr.$modepop.$scostr));
     } else {
-        echo '    <script type="text/javascript">'."\n//<![CDATA[\n".'var prev="'.$CFG->wwwroot.'/mod/scorm/view.php?id='.$cm->id."\";\n//]]>\n</script>\n";
+        $PAGE->requires->js_function_call('scorm_set_prev', Array($CFG->wwwroot.'/mod/scorm/view.php?id='.$cm->id));
     }
     if (($sco->nextid != 0) && ((!isset($sco->next)) || ($sco->next == 0))) {
         $scostr = '&scoid='.$sco->nextid;
-        echo '    <script type="text/javascript">'."\n//<![CDATA[\n".'var next="'.$CFG->wwwroot.'/mod/scorm/player.php?id='.$cm->id.$orgstr.$modepop.$scostr."\";\n//]]>\n</script>\n";
+        $PAGE->requires->js_function_call('scorm_set_next', Array($CFG->wwwroot.'/mod/scorm/player.php?id='.$cm->id.$orgstr.$modepop.$scostr));
     } else {
-        echo '    <script type="text/javascript">'."\n//<![CDATA[\n".'var next="'.$CFG->wwwroot.'/mod/scorm/view.php?id='.$cm->id."\";\n//]]>\n</script>\n";
+        $PAGE->requires->js_function_call('scorm_set_next', Array($CFG->wwwroot.'/mod/scorm/view.php?id='.$cm->id));
     }
 ?>
     <div id="scormpage">
@@ -301,9 +294,9 @@
 <?php
     if ($result->prerequisites) {
         if ($scorm->popup == 0) {
-            echo "                <script type=\"text/javascript\">scorm_resize(".$scorm->width.", ".$scorm->height.");</script>\n";
             $fullurl="loadSCO.php?id=".$cm->id.$scoidstr.$modestr;
             echo "                <iframe id=\"scoframe1\" class=\"scoframe\" name=\"scoframe1\" src=\"{$fullurl}\"></iframe>\n";
+            $PAGE->requires->js_function_call('scorm_resize', Array($scorm->width, $scorm->height));
         } else {
             // Clean the name for the window as IE is fussy
             $name = preg_replace("/[^A-Za-z0-9]/", "", $scorm->name);

diff --git a/mod/scorm/rd.js b/mod/scorm/rd.js
index c8c3038e01993b8029af7d89554051152fbe471b..872abd25336e0b84031839544ca9aa622cd4513b 100644 (file)
--- a/mod/scorm/rd.js
+++ b/mod/scorm/rd.js
@@ -1,4 +1,17 @@
 <!--
+function attach_resize_event(scormwidth, scormheight) {
+    YAHOO.util.Event.addListener(window, 'resize', scorm_resize);
+}
+
+var prev='';
+var next='';
+function scorm_set_prev(url) {
+    prev = url;
+}
+function scorm_set_next(url) {
+    next = url;
+}
+
 function scorm_get_element_style(obj, prop, cssProp) {
     var ret = '';
     
@@ -14,7 +27,8 @@ function scorm_get_element_style(obj, prop, cssProp) {
 }
 
 function scorm_resize (cwidth, cheight) {
-
+    var cwidth = scormdata.cwidth;
+    var cheight = scormdata.cheight;
     var winwidth = 0, winheight = 0;
     if( typeof( window.innerWidth ) == 'number' ) {
         //Non-IE