Author: nbelaevski
Date: 2008-04-29 14:41:30 -0400 (Tue, 29 Apr 2008)
New Revision: 8348
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
Log:
http://jira.jboss.com/jira/browse/RF-3302
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-04-29
17:29:17 UTC (rev 8347)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-04-29
18:41:30 UTC (rev 8348)
@@ -285,11 +285,15 @@
UIViewRoot root = context.getViewRoot();
ViewResources viewResources = new ViewResources();
String skinStyleSheetUri = null;
+ String skinExtendedStyleSheetUri = null;
try {
Skin skin = SkinFactory.getInstance().getSkin(context);
// Set default style sheet for current skin.
skinStyleSheetUri = (String) skin.getParameter(context,
Skin.generalStyleSheet);
+ // Set default style sheet for current skin.
+ skinExtendedStyleSheetUri = (String) skin.getParameter(context,
+ Skin.extendedStyleSheet);
// For a "NULL" skin, do not collect components stylesheets
if ("false".equals(skin.getParameter(context,
Skin.loadStyleSheets))) {
@@ -443,6 +447,12 @@
skinStyleSheetUri);
styles.add(resourceURL);
}
+
+ if (null != skinExtendedStyleSheetUri && useExtendedSkinning) {
+ String resourceURL =
context.getApplication().getViewHandler().getResourceURL(context,
+ skinExtendedStyleSheetUri);
+ styles.add(resourceURL);
+ }
if (styles.size() > 0) {
if (log.isDebugEnabled()) {
StringBuffer buff = new StringBuffer(