Initialize menuClones in the constructor

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / source / class / org / argeo / ria / event / Command.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js
index 0026170ade614afde3cd200de47ce08ff78dd2a9..83641c416a987c123263a93a791a464bd8a82669 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/ria/event/Command.js
@@ -48,7 +48,8 @@
        this.base(arguments, shortcut);\r
        this.setId(id);\r
        this.setLabel(label);\r
-       this.setIcon(icon);     \r
+       this.setIcon(icon);     \r
+       this.menuClones = [];\r
   },\r
   \r
   members :\r
@@ -62,13 +63,13 @@
                        this.getLabel(), \r
                        this.getIcon(), \r
                        this, \r
-                       this.getMenu()\r
+                       this.getMenuClone()\r
                );\r
                this.addTooltip(button);\r
                if(this.getMenu()){\r
                        this.addListener("changeMenu", function(event){\r
-                               this.setMenu(event.getData());\r
-                       }, button);\r
+                               button.setMenu(this.getMenuClone());\r
+                       }, this);                       \r
                }\r
                return button;\r
        },\r
@@ -108,40 +109,30 @@
         * @return {qx.ui.menu.Menu}\r
         */\r
        getMenuClone : function(){\r
-               if(!this.menuClone){\r
-                       this.menuClone = new qx.ui.menu.Menu();\r
-                       this.menuClone.setMinWidth(110);\r
+               var menuClone = new qx.ui.menu.Menu();\r
+               var submenus = this.getMenu();\r
+               if(!submenus) return;\r
+               for(var i=0;i<submenus.length;i++){\r
+                       var button = new qx.ui.menu.Button(submenus[i].label, submenus[i].icon);\r
+                       button.setUserData("commandId", submenus[i].commandId);\r
+                       button.addListener("execute", this.executeSubMenuCallback, this);\r
+                       menuClone.add(button);\r
                }\r
-               return this.menuClone;\r
+               this.menuClones.push(menuClone);\r
+               return menuClone;\r
        },\r
        \r
        /**\r
         * Remove all existing menus and their clones.\r
         */\r
        clearMenus : function(){\r
-               this.getMenu().removeAll();\r
-               this.getMenuClone().removeAll();\r
-       },\r
-       \r
-       /**\r
-        * Add button to a given submenu.\r
-        * @param label {String} The label of the button\r
-        * @param icon {String} The icon of the button\r
-        * @param commandId {String} The associated command id.\r
-        * @param menu {qx.ui.menu.Menu} The menu to which add the button\r
-        */\r
-       addSubMenuButton : function(label, icon, commandId, menu){\r
-               var button = new qx.ui.menu.Button(label, icon);\r
-               button.setUserData("commandId", commandId);\r
-               button.addListener("execute", this.executeSubMenuCallback, this);\r
-               if(menu){\r
-                       menu.add(button);\r
-               }else{\r
-                       this.getMenu().add(button);\r
-                       this.addSubMenuButton(label, icon, commandId, this.menuClone);\r
+               if(!this.getMenu()) return;\r
+               for(var i=0;i<this.menuClones.length;i++){\r
+                       this.menuClones[i].destroy();\r
                }\r
+               this.menuClones = [];\r
        },\r
-       \r
+               \r
        /**\r
         * Triggers the menuCallback property in the right context.\r
         * @param event {qx.event.type.Event} The firing event.\r