Author: nbelaevski Date: 2009-11-25 15:52:11 -0500 (Wed, 25 Nov 2009) New Revision: 16003 Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx Log: Optimization changes in menuItem renderer: new JSONObject() replaced with ScriptUtils Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-25 20:39:36 UTC (rev 16002) +++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2009-11-25 20:52:11 UTC (rev 16003) @@ -49,7 +49,6 @@ import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; import org.richfaces.renderkit.CompositeRenderer; -import org.richfaces.json.JSONObject; public class MenuItemRendererBase extends CompositeRenderer { @@ -356,7 +355,7 @@ delegate.initializeStyles(context, menuItem, menuItem.isDisabled(), variables); } - public static String toJson(Map map) { - return new JSONObject(map).toString(); + public String toScript(Map<?, ?> map) { + return ScriptUtils.toScript(map); } } Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx =================================================================== --- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-25 20:39:36 UTC (rev 16002) +++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2009-11-25 20:52:11 UTC (rev 16003) @@ -82,8 +82,8 @@ <div id="#{clientId}" class="#{menuItemClass}" - onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{this:toJson(onmouseoutClasses)});" - onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{this:toJson(onmouseoverClasses)});" + onmouseout="RichFaces.Menu.Utils.itemMouseOut(event, this, #{this:toScript(onmouseoutClasses)});" + onmouseover="RichFaces.Menu.Utils.itemMouseOver(event, this, #{this:toScript(onmouseoverClasses)});" onclick="#{onclick}" style="#{menuItemStyle}"> <f:call name="utils.encodeAttributes">