Allows to pass buttons as objects in toolbar configuration

Fixes #31

Author: jbalsas

src/ui/yui/src/plugins/loader.js

@@ -97,6 +97,25 @@
                 }
             },
 
+            /**
+             * Resolves the name of a button module passed through configuration.
+             *
+             * @method  _getButtonName
+             * @protected
+             * @param  {String|Object} button A string representing the button or an object
+             * with a name attribute.
+             * @return {String} The name of the button.
+             */
+            _getButtonName: function(button) {
+                var buttonName = button;
+
+                if (typeof button !== 'string') {
+                    buttonName = button.name;
+                }
+
+                return buttonName
+            },
+
             /**
              * Retrieves a list of modules for all registered buttons and toolbars in the current
              * editor configuration.
@@ -133,11 +152,11 @@
 
                         if (CKEDITOR.tools.isArray(toolbarsConfig[i])) {
                             for (j = toolbarsConfig[i].length - 1; j >= 0; j--) { // put button modules
-                                modules.push('button-' + toolbarsConfig[i][j]);
+                                modules.push('button-' + this._getButtonName(toolbarsConfig[i][j]));
                             }
                         } else if (toolbarsConfig[i]) {
                             for (j = toolbarsConfig[i].buttons.length - 1; j >= 0; j--) { // put button modules
-                                modules.push('button-' + toolbarsConfig[i].buttons[j]);
+                                modules.push('button-' + this._getButtonName(toolbarsConfig[i].buttons[j]));
                             }
                         }
                     }

src/ui/yui/src/toolbars/toolbar-add.js

@@ -304,9 +304,12 @@ YUI.add('toolbar-add', function(Y) {
                  *     or:
                  * <pre><code>
                  *     buttons: [
-                 *         'image': {
-                 *             zIndex: 1024,
-                 *             property2: 1024
+                 *         {
+                 *             name: 'image',
+                 *             cfg: {
+                 *                 zIndex: 1024,
+                 *                 property2: 1024
+                 *             }
                  *         }
                  *     ]
                  * </pre></code>

src/ui/yui/src/toolbars/toolbar-base.js

@@ -30,13 +30,17 @@ YUI.add('toolbar-base', function(Y) {
             YArray.each(
                 instance.get('buttons'),
                 function(item) {
-                    var instanceName;
+                    var buttonName,
+                        cfg,
+                        instanceName;
 
-                    instanceName = instance._getButtonInstanceName(item);
+                    buttonName = Lang.isObject(item) ? item.name : item;
 
-                    item = Lang.isObject(item) ? item : null;
+                    instanceName = instance._getButtonInstanceName(buttonName);
 
-                    instance.plug(Y[instanceName], item);
+                    cfg = Lang.isObject(item) ? item.cfg : null;
+
+                    instance.plug(Y[instanceName], cfg);
 
                     // Each button will fire actionPerformed when user interacts with it. Here we will
                     // re-fire this event to the other buttons so they will be able to update their UI too.

src/ui/yui/src/toolbars/toolbar-image.js

@@ -148,9 +148,12 @@ YUI.add('toolbar-image', function(Y) {
                  *     or:
                  * <pre><code>
                  *     buttons: [
-                 *         'left': {
-                 *             zIndex: 1024,
-                 *             property2: 1024
+                 *         {
+                 *             name: 'left',
+                 *             cfg: {
+                 *                 zIndex: 1024,
+                 *                 property2: 1024
+                 *             }
                  *         }
                  *     ]
                  * </pre></code>

src/ui/yui/src/toolbars/toolbar-styles.js

@@ -119,9 +119,12 @@ YUI.add('toolbar-styles', function(Y) {
                  *     or:
                  * <pre><code>
                  *     buttons: [
-                 *         'strong': {
-                 *             zIndex: 1024,
-                 *             property2: 1024
+                 *         {
+                 *             name: 'strong',
+                 *             cfg: {
+                 *                 zIndex: 1024,
+                 *                 property2: 1024
+                 *             }
                  *         }
                  *     ]
                  * </pre></code>