Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden…

…/moodle
drakeg · Feb 14, 2011 · 9ceaf7b · 9ceaf7b
2 parents cbbc272 + 71550f6
commit 9ceaf7b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/mod/scorm/module.js b/mod/scorm/module.js
@@ -178,12 +178,6 @@ M.mod_scorm.init = function(Y, hide_nav, hide_toc, toc_title, window_name, launc
             if (alsowidth) {
                 scorm_layout_widget.setStyle('width', '');
                 var newwidth = scorm_get_htmlelement_size('content', 'width');
-                if (newwidth > 600) {
-                    scorm_layout_widget.setStyle('width', newwidth+'px');
-                }
-                else {
-                    scorm_layout_widget.setStyle('width', '600px');
-                }
             }
             // make sure that the max width of the TOC doesn't go to far
 

diff --git a/mod/scorm/version.php b/mod/scorm/version.php
@@ -6,7 +6,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 
-$module->version  = 2011013100;   // The (date) version of this module
+$module->version  = 2011021400;   // The (date) version of this module
 $module->requires = 2010080300;   // The version of Moodle that is required
 $module->cron     = 300;            // How often should cron check this module (seconds)?