[richfaces-svn-commits] JBoss Rich Faces SVN: r14008 - trunk/ui/contextMenu/src/main/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-05-04 11:23:57 -0400 (Mon, 04 May 2009)
New Revision: 14008

Modified:
   trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java
Log:
ContextMenu: incorrect default value of the disableDefaultMenu attribute.
https://jira.jboss.org/jira/browse/RF-6940

Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java
===================================================================
--- trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java	2009-05-04 15:14:08 UTC (rev 14007)
+++ trunk/ui/contextMenu/src/main/java/org/richfaces/component/UIContextMenu.java	2009-05-04 15:23:57 UTC (rev 14008)
@@ -57,7 +57,7 @@
     
     public boolean isDisableDefaultMenu() {
         if (this.disableDefaultMenuSet) {
-            return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent());
+            return this.disableDefaultMenu;
         }
         
         ValueExpression ve = getValueExpression(DISABLE_DEFAULT_MENU);
@@ -72,7 +72,7 @@
             }
         }
  
-        return this.disableDefaultMenu;
+        return ON_CONTEXT_MENU.equalsIgnoreCase(getEvent());
     }
     
     public void setDisableDefaultMenu(boolean disableDefault) {