[Openutils-svn] SF.net SVN: openutils:[1288] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/tree

[<mol...@us...>]

Revision: 1288
          http://openutils.svn.sourceforge.net/openutils/?rev=1288&view=rev
Author:   molaschi
Date:     2009-08-21 14:54:26 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
MEDIA-7 restore condition for browseMode

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java
    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/MediaModuleTree.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java	2009-08-21 14:47:47 UTC (rev 1287)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTree.java	2009-08-21 14:54:26 UTC (rev 1288)
@@ -335,7 +335,7 @@
         if (permissionWrite && StringUtils.isNotEmpty(htmlEdit) && !this.isBrowseMode())
         // && this.getRequest().getParameter("selectMedia") == null)
         {
-            dblclick = " ondblclick=\"" + this.getJavascriptTree() + ".editNodeData(this,'" + handle + "',0,'"+ htmlEdit.replace("\"", """) +"');\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            dblclick = " ondblclick=\"" + this.getJavascriptTree() + ".editNodeData(this,'" + handle + "',0,'" + htmlEdit.replace("\"", """) + "');\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
         html.append("<span class=\"mgnlTreeText\" id=\"");
         html.append(idPre);

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:47:47 UTC (rev 1287)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java	2009-08-21 14:54:26 UTC (rev 1288)
@@ -193,32 +193,37 @@
             menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$
         }
 
-        tree.addMenuItem(menuNewPage);
-
-        for (ContextMenuItem it : menusNewMedia)
+        if (!browseMode)
         {
-            tree.addMenuItem(it);
-        }
+            tree.addMenuItem(menuNewPage);
 
-        tree.addSeparator();
-        tree.addMenuItem(menuLoadZip);
+            for (ContextMenuItem it : menusNewMedia)
+            {
+                tree.addMenuItem(it);
+            }
 
-        tree.addSeparator();
-        tree.addMenuItem(menuDelete);
+            tree.addSeparator();
+            tree.addMenuItem(menuLoadZip);
 
-        tree.addSeparator();
-        tree.addMenuItem(menuCut);
-        tree.addMenuItem(menuCopy);
+            tree.addSeparator();
+            tree.addMenuItem(menuDelete);
 
-        if (!MediaModule.getInstance().isAutoactivate())
-        {
             tree.addSeparator();
-            tree.addMenuItem(menuActivateExcl);
-            tree.addMenuItem(menuActivate);
-            tree.addMenuItem(menuDeactivate);
+            tree.addMenuItem(menuCut);
+            tree.addMenuItem(menuCopy);
+
+            if (!MediaModule.getInstance().isAutoactivate())
+            {
+                tree.addSeparator();
+                tree.addMenuItem(menuActivateExcl);
+                tree.addMenuItem(menuActivate);
+                tree.addMenuItem(menuDeactivate);
+            }
         }
-
-        tree.addMenuItem(ContextMenuItem.getRefreshMenuItem(tree, msgs, request));
+        else
+        {
+            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.