You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/11/13 09:07:40 UTC
svn commit: r713674 -
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
Author: matzew
Date: Thu Nov 13 00:07:39 2008
New Revision: 713674
URL: http://svn.apache.org/viewvc?rev=713674&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/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
Modified: myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?rev=713674&r1=713673&r2=713674&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Thu Nov 13 00:07:39 2008
@@ -1081,6 +1081,24 @@
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)
{
@@ -1091,19 +1109,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);