Merge branch 'MDL-27890_m21' of git://github.com/stronk7/moodle into MOODLE_21_STABLE

lib/editor/tinymce/lib.php

@@ -141,6 +141,7 @@ class tinymce_texteditor extends texteditor {
                     'theme_advanced_fonts' => "Trebuchet=Trebuchet MS,Verdana,Arial,Helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;Wingdings=wingdings",
                     'theme_advanced_resize_horizontal' => true,
                     'theme_advanced_resizing' => true,
+                    'theme_advanced_resizing_min_height' => 30,
                     'theme_advanced_toolbar_location' => "top",
                     'theme_advanced_statusbar_location' => "bottom",
                     'spellchecker_rpc_url' => $CFG->wwwroot."/lib/editor/tinymce/tiny_mce/$this->version/plugins/spellchecker/rpc.php"

lib/editor/tinymce/readme_moodle.txt

@@ -4,20 +4,40 @@ Description of TinyMCE v3.3.9.1 library integration in Moodle
 Copyright: (c) 2004-2010, Moxiecode Systems AB, All rights reserved.
 License: GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
 
-Moodle maintainer: Petr Skoda (skodak) 
+Moodle maintainer: Petr Skoda (skodak)
 
 =========================================================================================
-Upgrade procedure:
- 1/ clone http://github.com/moodle/tinymce
- 2/ clone http://github.com/moodle/tinymce_spellchecker_php
+Upgrade procedure (by maintainer):
+
+ 1/ clone https://github.com/moodle/custom-tinymce
+ 2/ clone https://github.com/moodle/custom-tinymce_spellchecker_php
  3/ merge new changes in latest STABLE branches into these two repos
  4/ tweak paths in build script in moodle_build.sh and execute
- 5/ fix line endings 
+ 5/ fix line endings
  6/ download all TinyMCE lang files (extra/tools/download_langs.sh)
  7/ make sure your moodle installation has all language packs installed.
  7/ update moodle lang string files (extra/tools/update_lang_files.php)
  8/ ensure lang packs are updated into AMOS (lang.moodle.net)
 
+=========================================================================================
+Prepare local modification procedure (by developer):
+
+ 1/ clone https://github.com/moodle/custom-tinymce
+ 2/ clone https://github.com/moodle/custom-tinymce_spellchecker_php
+ 3/ apply local modifications to the STABLE branches in those two repos
+ 4/ tweak paths in build script in moodle_build.sh and execute
+ 5/ fix line endings
+ 6/ provide 2 patches into the corresponding MDL issue:
+    a) one patch with the version to be applied to custom-tinymce (one for each target branch)
+    b) another patch with the resulting changes to be applied to moodle.git (one for each target branch)
+ 7/ then integrator will:
+    a) apply patches in 6a/ to custom-tinymce repo
+    b/ standard integration of patches in 6b/ to moodle.git (review, test, upstream)
+ 8/ Done!
+
+Note1: if the local modification includes lang changes, then steps 6-8 (from upgrade) may be necessary. Contact
+AMOS maintainer / custom-tinymce maintainer / integrators about that.
+
 =========================================================================================
 Added:
  * plugins/gragmath/*
@@ -28,6 +48,7 @@ Modified:
  * image integration - file picker integration
  * string processing - uses our lang framework
  * form hacks
+ * MDL-27890 - allow editor to be smaller
 
  TODO:
  * update strings to integrate with AMOS

lib/editor/tinymce/tiny_mce/3.4.2/tiny_mce_jquery_src.js

@@ -9959,7 +9959,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
 
 				if (re.test('' + h))
-					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+					h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+							s.theme_advanced_resizing_min_height || 100);
 
 				// Render UI
 				o = t.theme.renderUI({
@@ -9992,8 +9993,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}
 
 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
-			if (h < 100)
-				h = 100;
+			if (h < (s.theme_advanced_resizing_min_height || 100))
+				h = s.theme_advanced_resizing_min_height || 100;
 
 			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';
 

lib/editor/tinymce/tiny_mce/3.4.2/tiny_mce_prototype_src.js

@@ -10810,7 +10810,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
 
 				if (re.test('' + h))
-					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+					h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+							s.theme_advanced_resizing_min_height || 100);
 
 				// Render UI
 				o = t.theme.renderUI({
@@ -10843,8 +10844,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}
 
 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
-			if (h < 100)
-				h = 100;
+			if (h < (s.theme_advanced_resizing_min_height || 100))
+				h = s.theme_advanced_resizing_min_height || 100;
 
 			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';
 

lib/editor/tinymce/tiny_mce/3.4.2/tiny_mce_src.js

@@ -10783,7 +10783,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
 
 				if (re.test('' + h))
-					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+					h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+							s.theme_advanced_resizing_min_height || 100);
 
 				// Render UI
 				o = t.theme.renderUI({
@@ -10816,8 +10817,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}
 
 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
-			if (h < 100)
-				h = 100;
+			if (h < (s.theme_advanced_resizing_min_height || 100))
+				h = s.theme_advanced_resizing_min_height || 100;
 
 			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';