You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/11/06 12:21:43 UTC
svn commit: r471697 -
/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
Author: weber
Date: Mon Nov 6 03:21:38 2006
New Revision: 471697
URL: http://svn.apache.org/viewvc?view=rev&rev=471697
Log:
TOBAGO-170 (tabgroup javascript is not loaded when tabgroup is clientside and loaded via ajax)
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?view=diff&rev=471697&r1=471696&r2=471697
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Mon Nov 6 03:21:38 2006
@@ -119,8 +119,17 @@
final String switchType = component.getSwitchType();
UIPage page = ComponentUtil.findPage(component);
- page.getScriptFiles().add("script/tab.js");
- page.getScriptFiles().add("script/tabgroup.js");
+ final String[] scripts = new String[]{
+ "script/tab.js",
+ "script/tabgroup.js"
+ };
+ for (String script : scripts) {
+ page.getScriptFiles().add(script);
+ }
+ if (TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
+ HtmlRendererUtil.writeScriptLoader(facesContext, scripts, new String[0]);
+ }
+
TobagoResponseWriter writer
= (TobagoResponseWriter) facesContext.getResponseWriter();
@@ -157,18 +166,12 @@
if (TobagoConfig.getInstance(facesContext).isAjaxEnabled()
&& SWITCH_TYPE_RELOAD_TAB.equals(switchType)) {
- final String pageId
- = ComponentUtil.findPage(component).getClientId(facesContext);
- final String[] scripts = new String[]{
- "script/tab.js",
- "script/tabgroup.js"
- };
final String[] cmds = {
"new Tobago.TabGroup(",
" '" + clientId + "', ",
" '" + activeIndex + "');"
};
- HtmlRendererUtil.writeScriptLoader(facesContext, scripts, cmds);
+ HtmlRendererUtil.writeScriptLoader(facesContext, new String[0], cmds);
}
}
}