From: <mol...@us...> - 2009-08-21 14:46:06
|
Revision: 1286 http://openutils.svn.sourceforge.net/openutils/?rev=1286&view=rev Author: molaschi Date: 2009-08-21 14:45:54 +0000 (Fri, 21 Aug 2009) Log Message: ----------- MEDIA-7 removed check for "browse mode" to filter out context menu items on folders Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:43:38 UTC (rev 1285) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:45:54 UTC (rev 1286) @@ -193,37 +193,32 @@ menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$ } - if (!browseMode && request.getParameter("selectMedia") == null) + tree.addMenuItem(menuNewPage); + + for (ContextMenuItem it : menusNewMedia) { - tree.addMenuItem(menuNewPage); + tree.addMenuItem(it); + } - for (ContextMenuItem it : menusNewMedia) - { - tree.addMenuItem(it); - } + tree.addSeparator(); + tree.addMenuItem(menuLoadZip); - tree.addSeparator(); - tree.addMenuItem(menuLoadZip); + tree.addSeparator(); + tree.addMenuItem(menuDelete); - tree.addSeparator(); - tree.addMenuItem(menuDelete); + tree.addSeparator(); + tree.addMenuItem(menuCut); + tree.addMenuItem(menuCopy); + if (!MediaModule.getInstance().isAutoactivate()) + { tree.addSeparator(); - tree.addMenuItem(menuCut); - tree.addMenuItem(menuCopy); - - if (!MediaModule.getInstance().isAutoactivate()) - { - tree.addSeparator(); - tree.addMenuItem(menuActivateExcl); - tree.addMenuItem(menuActivate); - tree.addMenuItem(menuDeactivate); - } + tree.addMenuItem(menuActivateExcl); + tree.addMenuItem(menuActivate); + tree.addMenuItem(menuDeactivate); } - else - { - tree.addMenuItem(ContextMenuItem.getRefreshMenuItem(tree, msgs, request)); - } + + tree.addMenuItem(ContextMenuItem.getRefreshMenuItem(tree, msgs, request)); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |