WordPress 4.3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / themes / modern / theme.js

diff --git a/wp-includes/js/tinymce/themes/modern/theme.js b/wp-includes/js/tinymce/themes/modern/theme.js
index 47739f8547e59ed007f774ba82b725d757117b4f..f94e37d3424faf913a7ae4cf7d95c5c7dc7f5dd2 100644 (file)
--- a/wp-includes/js/tinymce/themes/modern/theme.js
+++ b/wp-includes/js/tinymce/themes/modern/theme.js
@@ -28,7 +28,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
        var defaultToolbar = "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | " +
                "bullist numlist outdent indent | link image";
 
-       function createToolbar(items) {
+       function createToolbar(items, size) {
                var toolbarItems = [], buttonGroup;
 
                if (!items) {
@@ -88,12 +88,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
                                buttonGroup = null;
                        } else {
                                if (Factory.has(item)) {
-                                       item = {type: item};
-
-                                       if (settings.toolbar_items_size) {
-                                               item.size = settings.toolbar_items_size;
-                                       }
-
+                                       item = {type: item, size: size};
                                        toolbarItems.push(item);
                                        buttonGroup = null;
                                } else {
@@ -112,10 +107,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
                                                }
 
                                                item.type = item.type || 'button';
-
-                                               if (settings.toolbar_items_size) {
-                                                       item.size = settings.toolbar_items_size;
-                                               }
+                                               item.size = size;
 
                                                item = Factory.create(item);
                                                buttonGroup.items.push(item);
@@ -140,14 +132,15 @@ tinymce.ThemeManager.add('modern', function(editor) {
        /**
         * Creates the toolbars from config and returns a toolbar array.
         *
+        * @param {String} size Optional toolbar item size.
         * @return {Array} Array with toolbars.
         */
-       function createToolbars() {
+       function createToolbars(size) {
                var toolbars = [];
 
                function addToolbar(items) {
                        if (items) {
-                               toolbars.push(createToolbar(items));
+                               toolbars.push(createToolbar(items, size));
                                return true;
                        }
                }
@@ -670,7 +663,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
                                border: 1,
                                items: [
                                        settings.menubar === false ? null : {type: 'menubar', border: '0 0 1 0', items: createMenuButtons()},
-                                       createToolbars()
+                                       createToolbars(settings.toolbar_items_size)
                                ]
                        });
 
@@ -747,7 +740,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
                        border: 1,
                        items: [
                                settings.menubar === false ? null : {type: 'menubar', border: '0 0 1 0', items: createMenuButtons()},
-                               createToolbars(),
+                               createToolbars(settings.toolbar_items_size),
                                {type: 'panel', name: 'iframe', layout: 'stack', classes: 'edit-area', html: '', border: '1 0 0 0'}
                        ]
                });