You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/31 15:26:03 UTC
svn commit: r265039 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom:
jslistener/JsValueChangeListenerRenderer.java
navmenu/HtmlNavigationMenuItemTag.java popup/HtmlPopupRenderer.java
Author: mmarinschek
Date: Wed Aug 31 06:25:58 2005
New Revision: 265039
URL: http://svn.apache.org/viewcvs?rev=265039&view=rev
Log:
final fix for MYFACES-458
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java?rev=265039&r1=265038&r2=265039&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java Wed Aug 31 06:25:58 2005
@@ -122,7 +122,21 @@
}
- uiComponent.getAttributes().put(propName, value);
+ if(value != null)
+ {
+ uiComponent.getAttributes().put(propName, value);
+ }
+ else
+ {
+ try
+ {
+ uiComponent.getAttributes().remove(propName);
+ }
+ catch(Exception ex)
+ {
+ log.error("the value could not be removed : ",ex);
+ }
+ }
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java?rev=265039&r1=265038&r2=265039&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java Wed Aug 31 06:25:58 2005
@@ -66,7 +66,10 @@
super.setProperties(component);
setStringProperty(component, ICON_ATTR, _icon);
// set action attribute as String!
- component.getAttributes().put(ACTION_ATTR, _action);
+
+ if(_action != null)
+ component.getAttributes().put(ACTION_ATTR, _action);
+
setBooleanProperty(component, SPLIT_ATTR, _split);
setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=265039&r1=265038&r2=265039&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Wed Aug 31 06:25:58 2005
@@ -172,7 +172,7 @@
oldValueStr +=";";
}
- value = oldValueStr + genCommentary+value;
+ value = oldValueStr+genCommentary+value;
uiComponent.getAttributes().put(propName, value);
}