Consider toolbars as widgets and group all styling toolbars into one

Fixes #64
liferay · Jan 30, 2015 · 156e27e · 156e27e
1 parent 7de72c0
commit 156e27e
Show file tree

Hide file tree

Showing 12 changed files with 527 additions and 439 deletions.
diff --git a/src/ui/yui/config/yui-modules.js b/src/ui/yui/config/yui-modules.js
@@ -55,7 +55,7 @@
     'button-a': {
         group: 'AlloyEditor',
         path: 'buttons/button-a.js',
-        requires: ['button-base', 'event-valuechange', 'node-focusmanager']
+        requires: ['button-base', 'event-valuechange']
     },
 
     'button-h1': {
@@ -133,7 +133,7 @@
     'toolbar-base': {
         group: 'AlloyEditor',
         path: 'toolbars/toolbar-base.js',
-        requires: ['plugin', 'node-base', 'transition']
+        requires: ['plugin', 'node-base', 'node-focusmanager', 'transition']
     },
 
     'toolbar-position': {
@@ -145,19 +145,13 @@
     'toolbar-add': {
         group: 'AlloyEditor',
         path: 'toolbars/toolbar-add.js',
-        requires: ['widget-base', 'widget-position', 'widget-position-constrain', 'widget-position-align', 'toolbar-base']
+        requires: ['toolbar-base', 'toolbar-position', 'widget-base', 'widget-position', 'widget-position-constrain', 'widget-position-align']
     },
 
     'toolbar-styles': {
         group: 'AlloyEditor',
         path: 'toolbars/toolbar-styles.js',
-        requires: ['toolbar-base', 'widget-base', 'widget-position', 'widget-position-constrain']
-    },
-
-    'toolbar-image': {
-        group: 'AlloyEditor',
-        path: 'toolbars/toolbar-image.js',
-        requires: ['dom-screen', 'widget-base', 'widget-position', 'widget-position-constrain', 'toolbar-base']
+        requires: ['toolbar-base', 'toolbar-position', 'widget-base', 'widget-position', 'widget-position-constrain', 'widget-position-align']
     },
 
     'selector-patch': {

diff --git a/src/ui/yui/demo/index.html b/src/ui/yui/demo/index.html
@@ -89,11 +89,12 @@ <h2>Technical details <a id="tech-details" name="tech-details"></a></h2>
 
                 var editor2 = new Y.AlloyEditor({
                     srcNode: '#headline',
-                    toolbars: {}
+                    widgets: []
                 });
 
                 var editor3 = new Y.AlloyEditor({
-                    srcNode: '#description'
+                    srcNode: '#description',
+                    widgets: []
                 });
             });
         </script>