mod-assignment MDL-16706 Eliminated inline scripts to use PAGE methods

diff --git a/mod/assignment/assignment.js b/mod/assignment/assignment.js
new file mode 100644 (file)
index 0000000..0a028fa
--- /dev/null
+++ b/mod/assignment/assignment.js
@@ -0,0 +1,11 @@
+function setNext(){
+    document.getElementById('submitform').mode.value = 'next';
+    document.getElementById('submitform').userid.value = assignment.nextid;
+}
+
+function saveNext(){
+    document.getElementById('submitform').mode.value = 'saveandnext';
+    document.getElementById('submitform').userid.value = assignment.nextid;
+    document.getElementById('submitform').saveuserid.value = assignment.userid;
+    document.getElementById('submitform').menuindex.value = document.getElementById('submitform').grade.selectedIndex;
+}
\ No newline at end of file

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index b6f46092737a3a1dc1a4bee6f10a738ce69e7dd5..b569cbdabe9bfe5339eab994b2410d592f5fd346 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -847,7 +847,7 @@ class assignment_base {
      * @param string $extra_javascript
      */
     function display_submission($extra_javascript = '') {
-        global $CFG, $DB;
+        global $CFG, $DB, $PAGE;
         require_once($CFG->libdir.'/gradelib.php');
         require_once($CFG->libdir.'/tablelib.php');
 
@@ -919,22 +919,9 @@ class assignment_base {
         /// Print any extra javascript needed for saveandnext
         echo $extra_javascript;
 
-        ///SOme javascript to help with setting up >.>
-
-        echo '<script type="text/javascript">'."\n";
-        echo 'function setNext(){'."\n";
-        echo 'document.getElementById(\'submitform\').mode.value=\'next\';'."\n";
-        echo 'document.getElementById(\'submitform\').userid.value="'.$nextid.'";'."\n";
-        echo '}'."\n";
-
-        echo 'function saveNext(){'."\n";
-        echo 'document.getElementById(\'submitform\').mode.value=\'saveandnext\';'."\n";
-        echo 'document.getElementById(\'submitform\').userid.value="'.$nextid.'";'."\n";
-        echo 'document.getElementById(\'submitform\').saveuserid.value="'.$userid.'";'."\n";
-        echo 'document.getElementById(\'submitform\').menuindex.value = document.getElementById(\'submitform\').grade.selectedIndex;'."\n";
-        echo '}'."\n";
+        echo $PAGE->requires->data_for_js('assignment', Array('nextid'=>$nextid, 'userid'=>$userid))->asap();
+        echo $PAGE->requires->js('mod/assignment/assignment.js')->asap();
 
-        echo '</script>'."\n";
         echo '<table cellspacing="0" class="feedback '.$subtype.'" >';
 
         ///Start of teacher info row