Fix #227 (duplicate menus)

pydio · Aug 23, 2013 · 3b38383 · 3b38383
1 parent 79ba3c2
commit 3b38383
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
@@ -41,7 +41,7 @@
         <action name="create">
             <gui text="154" title="155" src="folder_new.png" iconClass="icon-plus" accessKey="folder_access_key" hasAccessKey="true">
                 <context selection="false" dir="true" recycle="hidden" actionBar="true"
-                         contextMenu="true" infoPanel="false" actionBarGroup="put" inZip="false"/>
+                         contextMenu="false" infoPanel="false" actionBarGroup="put" inZip="false"/>
             </gui>
             <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
             <subMenu>

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActionsToolbar.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActionsToolbar.js
@@ -158,7 +158,7 @@ Class.create("ActionsToolbar", {
                 dir:true,
                 actionBar:true,
                 actionBarGroup:'put',
-                contextMenu:true,
+                contextMenu:false,
                 infoPanel:false
 
             }, {}, {}, {dynamicItems: submenuItems});

diff --git a/core/src/plugins/gui.ajax/res/js/lib/prototype/proto.menu.js b/core/src/plugins/gui.ajax/res/js/lib/prototype/proto.menu.js
@@ -164,10 +164,17 @@ Proto.Menu = Class.create({
 				}).update(text)
 			);		
 		}
+        var registeredKeys = $A();
 		this.options.menuItems.each(function(item) {
-
+
+            if(!item.separator){
+                var key = item.name;
+                if(registeredKeys.indexOf(key) !== -1) return;
+                registeredKeys.push(key);
+            }
+
 			var newItem = new Element('li', {className: item.separator ? 'separator' : ''});
-			
+
 			if(item.moreActions){
 				var actionsContainer = new Element('div', {
                     className:'menuActions moreActions',