Ticket #30942: 30942.patch

src/wp-includes/js/quicktags.js

@@ -223 +223 @@
 
                 if ( tb.addEventListener ) {
                         tb.addEventListener( 'click', onclick, false );
-                        
+
                         if ( wrap ) {
                                 wrap.addEventListener( 'click', setActiveEditor, false );
                         }
@@ -265 +265 @@
 
         qt._buttonsInit = function() {
                 var t = this, canvas, name, settings, theButtons, html, inst, ed, id, i, use,
-                        defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,';
+                        defaults = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 
                 for ( inst in t.instances ) {
                         if ( '0' === inst ) {
@@ -280 +280 @@
                         theButtons = {};
                         use = '';
 
+                        if ( settings.buttons === 'undefined' ) {
+                                settings.buttons = defaults;
+                        }
+
                         // set buttons
                         if ( settings.buttons ) {
-                                use = ','+settings.buttons+',';
-                        }
+                                use = ',' + settings.buttons + ',';
+                                defaults = ',' + defaults + ',';
 
-                        for ( i in edButtons ) {
-                                if ( !edButtons[i] ) {
-                                        continue;
-                                }
+                                for ( i in edButtons ) {
+                                        if ( !edButtons[i] ) {
+                                                continue;
+                                        }
 
-                                id = edButtons[i].id;
-                                if ( use && defaults.indexOf( ',' + id + ',' ) !== -1 && use.indexOf( ',' + id + ',' ) === -1 ) {
-                                        continue;
-                                }
+                                        id = edButtons[i].id;
+                                        if ( use && defaults.indexOf( ',' + id + ',' ) !== -1 && use.indexOf( ',' + id + ',' ) === -1 ) {
+                                                continue;
+                                        }
 
-                                if ( !edButtons[i].instance || edButtons[i].instance === inst ) {
-                                        theButtons[id] = edButtons[i];
+                                        if ( !edButtons[i].instance || edButtons[i].instance === inst ) {
+                                                theButtons[id] = edButtons[i];
 
-                                        if ( edButtons[i].html ) {
-                                                html += edButtons[i].html(name + '_');
+                                                if ( edButtons[i].html ) {
+                                                        html += edButtons[i].html(name + '_');
+                                                }
                                         }
                                 }
-                        }
 
-                        if ( use && use.indexOf(',dfw,') !== -1 ) {
-                                theButtons.dfw = new qt.DFWButton();
-                                html += theButtons.dfw.html( name + '_' );
-                        }
+                                if ( use.indexOf(',dfw,') !== -1 ) {
+                                        theButtons.dfw = new qt.DFWButton();
+                                        html += theButtons.dfw.html( name + '_' );
+                                }
 
-                        if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) {
-                                theButtons.textdirection = new qt.TextDirectionButton();
-                                html += theButtons.textdirection.html(name + '_');
+                                if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) {
+                                        theButtons.textdirection = new qt.TextDirectionButton();
+                                        html += theButtons.textdirection.html(name + '_');
+                                }
+
+                                ed.toolbar.innerHTML = html;
+                        } else {
+                                ed.toolbar.style.display = 'none';
                         }
 
-                        ed.toolbar.innerHTML = html;
                         ed.theButtons = theButtons;
 
                         if ( typeof jQuery !== 'undefined' ) {