You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/06/02 05:37:45 UTC
svn commit: r179498 -
/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
Author: svieujot
Date: Wed Jun 1 20:37:44 2005
New Revision: 179498
URL: http://svn.apache.org/viewcvs?rev=179498&view=rev
Log:
JSCookMenu : Remove unnecessary themes loading.
Modified:
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java?rev=179498&r1=179497&r2=179498&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java Wed Jun 1 20:37:44 2005
@@ -118,7 +118,7 @@
values[2] = _theme;
values[3] = _enabledOnUserRole;
values[4] = _visibleOnUserRole;
- return ((Object) (values));
+ return values;
}
public void restoreState(FacesContext context, Object state)
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=179498&r1=179497&r2=179498&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Wed Jun 1 20:37:44 2005
@@ -257,28 +257,32 @@
RendererUtils.checkParamValidity(context, component, HtmlCommandJSCookMenu.class);
HtmlCommandJSCookMenu menu = (HtmlCommandJSCookMenu)component;
+ String theme = menu.getTheme();
+
AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "JSCookMenu.js", context);
AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "MyFacesHack.js", context);
- AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeOffice/theme.js", context);
- AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeOffice/theme.css", context);
-
- AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeMiniBlack/theme.js", context);
- AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeMiniBlack/theme.css", context);
-
- AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeIE/theme.js", context);
- AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeIE/theme.css", context);
-
- AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemePanel/theme.js", context);
- AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemePanel/theme.css", context);
-
+ if( theme.equals( "ThemeOffice" ) ){
+ AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeOffice/theme.js", context);
+ AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeOffice/theme.css", context);
+ }else if( theme.equals( "ThemeMiniBlack" ) ){
+ AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeMiniBlack/theme.js", context);
+ AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeMiniBlack/theme.css", context);
+ }else if( theme.equals( "ThemeIE" ) ){
+ AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemeIE/theme.js", context);
+ AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemeIE/theme.css", context);
+ }else if( theme.equals( "ThemePanel" ) ){
+ AddResource.addJavaScriptToHeader(HtmlJSCookMenuRenderer.class, "ThemePanel/theme.js", context);
+ AddResource.addStyleSheet(HtmlJSCookMenuRenderer.class, "ThemePanel/theme.css", context);
+ }
+ // Otherwise ?? bug ??
ResponseWriter writer = context.getResponseWriter();
String menuId = getMenuId(context, component);
writer.write("<div id=\"" + menuId + "\"></div>\n" +
"<script type=\"text/javascript\"><!--\n" +
- "\tcmDraw ('" + menuId + "', " + menuId + ", '" + menu.getLayout() + "', cm" + menu.getTheme() + ", '" + menu.getTheme() + "');\n" +
+ "\tcmDraw ('" + menuId + "', " + menuId + ", '" + menu.getLayout() + "', cm" + theme + ", '" + theme + "');\n" +
"--></script>\n");
}