Better way to handle commands'submenus, to be able to duplicate them in context menus.

[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..b42fd4338505471e389c4bf2f0b370d00e10a740 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,7 @@
        this.base(arguments, shortcut);\r
        this.setId(id);\r
        this.setLabel(label);\r
-       this.setIcon(icon);     \r
+       this.setIcon(icon);     \r
   },\r
   \r
   members :\r
@@ -67,8 +67,9 @@
                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
+                       this.menuClones = [];\r
                }\r
                return button;\r
        },\r
@@ -108,19 +109,27 @@
         * @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
+               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
+               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
@@ -138,7 +147,6 @@
                        menu.add(button);\r
                }else{\r
                        this.getMenu().add(button);\r
-                       this.addSubMenuButton(label, icon, commandId, this.menuClone);\r
                }\r
        },\r
        \r