Merge branch 'MDL-40282.25' of github.com:colchambers/moodle into MOO…

…DLE_25_STABLE
moodle · Jul 2, 2013 · f6b1260 · f6b1260
2 parents 1e6919f + 93a2a0e
commit f6b1260
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.../tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-debug.js b/.../tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-debug.js
@@ -100,6 +100,7 @@ Y.extend(COLLAPSE, Y.Base, {
         // Fortunately, the hight is not necessary, so we can just remove it.
         // (If you re-size the editor then it will remove this style attribute itself.)
         editortable.setStyle('height', '');
+        editortable.setStyle('width', '');
     },
 
     /**

diff --git a/...or/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-min.js b/...or/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse-min.js
diff --git a/...editor/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse.js b/...editor/tinymce/yui/build/moodle-editor_tinymce-collapse/moodle-editor_tinymce-collapse.js
@@ -100,6 +100,7 @@ Y.extend(COLLAPSE, Y.Base, {
         // Fortunately, the hight is not necessary, so we can just remove it.
         // (If you re-size the editor then it will remove this style attribute itself.)
         editortable.setStyle('height', '');
+        editortable.setStyle('width', '');
     },
 
     /**

diff --git a/lib/editor/tinymce/yui/src/collapse/js/collapse.js b/lib/editor/tinymce/yui/src/collapse/js/collapse.js
@@ -98,6 +98,7 @@ Y.extend(COLLAPSE, Y.Base, {
         // Fortunately, the hight is not necessary, so we can just remove it.
         // (If you re-size the editor then it will remove this style attribute itself.)
         editortable.setStyle('height', '');
+        editortable.setStyle('width', '');
     },
 
     /**