Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git

diff --cc mod/scorm/locallib.php
index 2561277,eb6e008..982329f
--- 1/mod/scorm/locallib.php
--- 2/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@@ -121,9 -121,10 +121,10 @@@ function scorm_get_skip_view_array() 
   * @return array an array of hide table of contents options
   */
  function scorm_get_hidetoc_array() {
-      return array(0 =>get_string('sided', 'scorm'),
-                   1 => get_string('hidden', 'scorm'),
-                   2 => get_string('popupmenu', 'scorm'));
 -     return array(SCORM_TOC_SIDE =>get_string('sided', 'scorm'),
++     return array(SCORM_TOC_SIDE => get_string('sided', 'scorm'),
+                   SCORM_TOC_HIDDEN => get_string('hidden', 'scorm'),
+                   SCORM_TOC_POPUP => get_string('popupmenu', 'scorm'),
+                   SCORM_TOC_DISABLED => get_string('disabled', 'scorm'));
  }
  
  /**

diff --cc mod/scorm/module.js
index 0893b24,459e1ca..f523509
--- 1/mod/scorm/module.js
--- 2/mod/scorm/module.js
+++ b/mod/scorm/module.js
@@@ -28,18 -28,16 +28,14 @@@ mod_scorm_activate_item = null
  M.mod_scorm = {};
  
  M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launch_sco) {
- 
-     if (hide_nav == 0) {
-         scorm_hide_nav = false;
-     }
-     else {
-         scorm_hide_nav = true;
-     }
+     var scorm_disable_toc = false;
+     var scorm_hide_nav = true;
+     var scorm_hide_toc = true;
 -    if (hide_nav == 0) {
 -        scorm_hide_nav = false;
 -    }
      if (hide_toc == 0) {
++        scorm_hide_nav = false;
          scorm_hide_toc = false;
-     }
-     else {
-         scorm_hide_toc = true;
+     } else if (hide_toc == 3) {
+         scorm_disable_toc = true;
      }
  
      var scorm_layout_widget;