svn commit: r713676 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java

[ma...@apache.org]

Author: matzew
Date: Thu Nov 13 00:08:36 2008
New Revision: 713676

URL: http://svn.apache.org/viewvc?rev=713676&view=rev
Log:
TRINIDAD-1298 - tr:navigationPane:Choosing hint to choice disables the current page link

thx to Mamallan Uthaman for the patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?rev=713676&r1=713675&r2=713676&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Thu Nov 13 00:08:36 2008
@@ -1122,6 +1122,23 @@
                 TrinidadAgent.CAP_SUPPORTS_DISABLED_OPTIONS)))
     {
       boolean isActive = getBooleanFromProperty(itemData.get("isActive"));
+      UIXCommand commandChild = null;
+      String destination = null;
+      boolean partialSubmit = false;
+      if (!isDisabled)
+      {  
+         // Write the script to evaluate once the item is selected
+         commandChild = (UIXCommand)itemData.get("component");
+         destination = toString(itemData.get("destination"));
+         if (destination == null)
+         { 
+           partialSubmit = getBooleanFromProperty(itemData.get("partialSubmit"));
+           if (partialSubmit)
+           {
+             AutoSubmitUtils.writeDependencies(context, arc);
+           }
+         }
+      }
       rw.startElement("option", null);
       if (isActive)
       {
@@ -1132,19 +1149,10 @@
 
       if (!isDisabled)
       {
-        // Write the script to evaluate once the item is selected
-        UIXCommand commandChild = (UIXCommand)itemData.get("component");
-        String destination = toString(itemData.get("destination"));
         boolean immediate = false;
-        boolean partialSubmit = false;
         if (destination == null)
         {
           immediate = getBooleanFromProperty(itemData.get("immediate"));
-          partialSubmit = getBooleanFromProperty(itemData.get("partialSubmit"));
-          if (partialSubmit)
-          {
-            AutoSubmitUtils.writeDependencies(context, arc);
-          }
           String clientId = commandChild.getClientId(context);
           // Make sure we don't have anything to save
           assert(arc.getCurrentClientId() == null);