From 46a24596b8157766dbe787efc36298e6587f867a Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Fri, 5 Jul 2013 13:54:38 +0800
Subject: [PATCH] MDL-23646 tinymce: Fix for pdw plugin

This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.

This broke the wrapping plugin.
---
 lib/editor/tinymce/plugins/pdw/readme_moodle.txt   |  2 ++
 .../tinymce/plugins/pdw/tinymce/editor_plugin.js   |  5 +----
 .../plugins/pdw/tinymce/editor_plugin_src.js       | 14 ++++++++++----
 lib/editor/tinymce/plugins/pdw/version.php         |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/editor/tinymce/plugins/pdw/readme_moodle.txt b/lib/editor/tinymce/plugins/pdw/readme_moodle.txt
index 2466e1e9b39..0f510fffd88 100644
--- a/lib/editor/tinymce/plugins/pdw/readme_moodle.txt
+++ b/lib/editor/tinymce/plugins/pdw/readme_moodle.txt
@@ -11,3 +11,5 @@ Upgrade procedure:
 1/ extract standard PDW package into lib/editor/tinymce/plugins/pdw/tinymce/
 2/ bump up version.php
 3/ update lib/thirdpartylibs.xml
+4/ reimplement patch in MDL-23646
+5/ reminify the js manually (I used uglifyjs)
diff --git a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js
index 321ccc2c2da..3646b35abf7 100644
--- a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js
+++ b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js
@@ -22,7 +22,4 @@
  * THE SOFTWARE.
  * Based on TinyMCE Wordpress plugin (Kitchen Sink)
  */
-(function(){var d=tinymce.DOM;tinymce.PluginManager.requireLangPack("pdw");tinymce.create("tinymce.plugins.pdw",{init:function(a,h){var e=this,i=[],j=[],c;j=a.settings.pdw_toggle_toolbars.split(",");for(c=0;c<j.length;c++)i[c]=a.getParam("","toolbar"+j[c].replace(" ",""));a.addCommand("mcePDWToggleToolbars",function(){var f=a.controlManager,b,g,l=tinymce.util.Cookie,k,m=l.getHash("TinyMCE_toggle")||{};for(g=0;g<i.length;g++){obj=a.controlManager.get(i[g]);if(typeof obj!="undefined"){b=obj.id;if(d.isHidden(b)){k=
-0;d.show(b);e._resizeIframe(a,i[g],-26)}else{k=1;d.hide(b);e._resizeIframe(a,i[g],26)}}}f.setActive("pdw_toggle",k);a.settings.pdw_toggle_on=k;m[a.id]=k;l.setHash("TinyMCE_toggle",m)});a.addButton("pdw_toggle",{title:a.getLang("pdw.desc",0),cmd:"mcePDWToggleToolbars",image:h+"/img/toolbars.gif"});a.onPostRender.add(function(){var f=tinymce.util.Cookie.getHash("TinyMCE_toggle")||{},b=false;if(f[a.id]==null)b=a.settings.pdw_toggle_on==1?true:false;else if(f[a.id]==1)b=true;if(b){f=a.controlManager;
-for(c=0;c<j.length;c++){tbId=a.getParam("","toolbar"+j[c].replace(" ",""));b=a.controlManager.get(tbId).id;f.setActive("pdw_toggle",1);d.hide(b);e._resizeIframe(a,tbId,26)}}})},_resizeIframe:function(a,h,e){h=a.getContentAreaContainer().firstChild;d.setStyle(h,"height",d.getSize(h).h+e);a.theme.deltaHeight+=e},getInfo:function(){return{longname:"PDW Toggle Toolbars",author:"Guido Neele",authorurl:"http://www.neele.name/",infourl:"http://www.neele.name/pdw_toggle_toolbars",version:"1.2"}}});tinymce.PluginManager.add("pdw",
-tinymce.plugins.pdw)})();
\ No newline at end of file
+!function(){var DOM=tinymce.DOM;tinymce.PluginManager.requireLangPack("pdw");tinymce.create("tinymce.plugins.pdw",{init:function(ed,url){var t=this,tbIds=new Array,toolbars=new Array,i;toolbars=ed.settings.pdw_toggle_toolbars.split(",");for(i=0;i<toolbars.length;i++){tbIds[i]=ed.getParam("","toolbar"+toolbars[i].replace(" ",""))}ed.addCommand("mcePDWToggleToolbars",function(){var cm=ed.controlManager,id,j,Cookie=tinymce.util.Cookie,Toggle_PDW,Toggle=Cookie.getHash("TinyMCE_toggle")||new Object;for(j=0;j<tbIds.length;j++){obj=ed.controlManager.get(tbIds[j]);if(typeof obj=="undefined"){continue}id=obj.id;if(DOM.isHidden(id)){Toggle_PDW=0;var e=document.getElementById(id);if(e){e.style.display="table";t._resizeIframe(ed,tbIds[j],-26)}}else{Toggle_PDW=1;var e=document.getElementById(id);if(e){e.style.display="none"}t._resizeIframe(ed,tbIds[j],26)}}cm.setActive("pdw_toggle",Toggle_PDW);ed.settings.pdw_toggle_on=Toggle_PDW;Toggle[ed.id]=Toggle_PDW;Cookie.setHash("TinyMCE_toggle",Toggle)});ed.addButton("pdw_toggle",{title:ed.getLang("pdw.desc",0),cmd:"mcePDWToggleToolbars",image:url+"/img/toolbars.gif"});ed.onPostRender.add(function(){var toggle=tinymce.util.Cookie.getHash("TinyMCE_toggle")||new Object;var run=false;if(toggle[ed.id]==null){run=ed.settings.pdw_toggle_on==1?true:false}else if(toggle[ed.id]==1){run=true}if(run){var cm=ed.controlManager,tdId,id;for(i=0;i<toolbars.length;i++){tbId=ed.getParam("","toolbar"+toolbars[i].replace(" ",""));id=ed.controlManager.get(tbId).id;cm.setActive("pdw_toggle",1);DOM.hide(id);t._resizeIframe(ed,tbId,26)}}})},_resizeIframe:function(ed,tb_id,dy){var ifr=ed.getContentAreaContainer().firstChild;DOM.setStyle(ifr,"height",DOM.getSize(ifr).h+dy);ed.theme.deltaHeight+=dy},getInfo:function(){return{longname:"PDW Toggle Toolbars",author:"Guido Neele",authorurl:"http://www.neele.name/",infourl:"http://www.neele.name/pdw_toggle_toolbars",version:"1.2"}}});tinymce.PluginManager.add("pdw",tinymce.plugins.pdw)}();
\ No newline at end of file
diff --git a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin_src.js b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin_src.js
index ecd71fc2115..6a1c707d130 100644
--- a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin_src.js
+++ b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin_src.js
@@ -97,12 +97,18 @@
 					
 					if (DOM.isHidden(id)) {
 						Toggle_PDW = 0;
-						DOM.show(id);
-						t._resizeIframe(ed, tbIds[j], -26);
+                        var e = document.getElementById(id);
+                        if (e) {
+                            e.style.display = 'table';
+                            t._resizeIframe(ed, tbIds[j], -26);
+                        }
 						
 					} else {
 						Toggle_PDW = 1;
-						DOM.hide(id);
+                        var e = document.getElementById(id);
+                        if (e) {
+                            e.style.display = 'none';
+                        }
 						t._resizeIframe(ed, tbIds[j], 26);
 					}
 				}
@@ -173,4 +179,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('pdw', tinymce.plugins.pdw);
-})();
\ No newline at end of file
+})();
diff --git a/lib/editor/tinymce/plugins/pdw/version.php b/lib/editor/tinymce/plugins/pdw/version.php
index a1407c0ab0b..9f0021ac057 100644
--- a/lib/editor/tinymce/plugins/pdw/version.php
+++ b/lib/editor/tinymce/plugins/pdw/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // The current plugin version (Date: YYYYMMDDXX).
-$plugin->version   = 2013061400;
+$plugin->version   = 2013070500;
 // Required Moodle version.
 $plugin->requires  = 2013050100;
 // Full name of the plugin (used for diagnostics).