Ticket #9841: editor_plugin.dev.js.3.diff

editor_plugin.dev.js

@@ -9 +9 @@
                 mceTout : 0,
 
                 init : function(ed, url) {
-                        var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML;
+                        var t = this, tbId = new Array(), tbIDRegEx = new RegExp(/^content_toolbar[0-9]+$/), last = 0, moreHTML, nextpageHTML;
                         moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
                         nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
@@ -18 +18 @@
 
                         // Hides the specified toolbar and resizes the iframe
                         ed.onPostRender.add(function() {
-                                var adv_toolbar = ed.controlManager.get(tbId);
-                                if ( ed.getParam('wordpress_adv_hidden', 1) && adv_toolbar ) {
-                                        DOM.hide(adv_toolbar.id);
-                                        t._resizeIframe(ed, tbId, 28);
+                                for(var s in ed.controlManager.controls) {
+                                        if(s.match(tbIDRegEx) && s != 'content_toolbar1')
+                                                tbId.push(s);
+                                };
+
+                                for( var k in tbId ) {
+                                        console.log(typeof ed.controlManager.get( tbId[k] ));
+                                        if ( typeof ed.controlManager.get( tbId[k] ) == 'undefined' )
+                                                continue;
+                                        var adv_toolbar = ed.controlManager.get(tbId[k]);
+                                        if ( ed.getParam('wordpress_adv_hidden', 1) && adv_toolbar ) {
+                                                DOM.hide(adv_toolbar.id);
+                                                t._resizeIframe(ed, tbId[k], 28);
+                                        }
                                 }
                         });
 
@@ -44 +54 @@
                         });
 
                         ed.addCommand('WP_Adv', function() {
-                                var cm = ed.controlManager, id = cm.get(tbId).id;
-
-                                if ( 'undefined' == id )
-                                        return;
-
-                                if ( DOM.isHidden(id) ) {
-                                        cm.setActive('wp_adv', 1);
-                                        DOM.show(id);
-                                        t._resizeIframe(ed, tbId, -28);
-                                        ed.settings.wordpress_adv_hidden = 0;
-                                        setUserSetting('hidetb', '1');
-                                } else {
-                                        cm.setActive('wp_adv', 0);
-                                        DOM.hide(id);
-                                        t._resizeIframe(ed, tbId, 28);
-                                        ed.settings.wordpress_adv_hidden = 1;
-                                        setUserSetting('hidetb', '0');
+                                var cm = ed.controlManager, id;
+                                for( var k in tbId ) {
+                                        if ( typeof cm.get( tbId[k] ) == 'undefined' )
+                                                continue;
+                                        id = cm.get( tbId[k] ).id;
+                                        if ( 'undefined' == id )
+                                                continue;
+                                        if ( DOM.isHidden(id) ) {
+                                                cm.setActive('wp_adv', 1);
+                                                DOM.show(id);
+                                                t._resizeIframe(ed, tbId, -28);
+                                                ed.settings.wordpress_adv_hidden = 0;
+                                                setUserSetting('hidetb', '1');
+                                        } else {
+                                                cm.setActive('wp_adv', 0);
+                                                DOM.hide(id);
+                                                t._resizeIframe(ed, tbId, 28);
+                                                ed.settings.wordpress_adv_hidden = 1;
+                                                setUserSetting('hidetb', '0');
+                                        }
                                 }
                         });