MDL-19184 more tinymce integration and upgrade related improvements

diff --git a/lib/editor/tinymce/tiny_mce_popup_src.js b/lib/editor/tinymce/Popup.js
similarity index 100%
rename from lib/editor/tinymce/tiny_mce_popup_src.js
rename to lib/editor/tinymce/Popup.js

diff --git a/lib/editor/tinymce/extra/tools/compress.sh b/lib/editor/tinymce/extra/tools/compress.sh
new file mode 100644 (file)
index 0000000..bc3f1a8
--- /dev/null
+++ b/lib/editor/tinymce/extra/tools/compress.sh
@@ -0,0 +1,2 @@
+java -jar yuicompressor.jar --line-break 1000 ../../tiny_mce_src.js -o ../../tiny_mce.js
+java -jar yuicompressor.jar --line-break 1000 ../../Popup.js -o ../../tiny_mce_popup.js
\ No newline at end of file

diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt
index 67f97ab538543391467eb5bda6dc113b496ea7ab..cf24d02b658e9b361fc70c3bed88f8d792419c75 100644 (file)
--- a/lib/editor/tinymce/readme_moodle.txt
+++ b/lib/editor/tinymce/readme_moodle.txt
@@ -7,9 +7,9 @@ License:   GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
 Upgrade procedure:
  1/ Download latest dev package from http://tinymce.moxiecode.com/download.php
  2/ replace tiny_mce*.* files, themes/*, utils/* and plugins/* (keep dragmath, moodlenolink, spellchecker)
- 3/ copy tinymce/jscripts/tiny_mce/classes/Popup.js to tiny_mce_popup_src.js
+ 3/ copy tinymce/jscripts/tiny_mce/classes/Popup.js to Popup.js
  4/ apply patches
- 5/ compress modified js files using yuicompressor.jar from dev package
+ 5/ compress modified js files using yuicompressor.jar from dev package, use shell file extra/tools/compress.sh
  6/ download all TinyMCE lang files and update moodle lang string files 
 
 TODO: