3:45 p.m.
Author: alexsmirnov
Date: 2008-05-19 16:45:33 -0400 (Mon, 19 May 2008)
New Revision: 8644
Added:
trunk/cdk/maven-archetype-skin-addon/
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
Start progress on http://jira.jboss.com/jira/browse/RF-3273
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-05-19
19:21:06 UTC (rev 8643)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-05-19
20:45:33 UTC (rev 8644)
@@ -314,24 +314,30 @@
} else if (InternetResourceBuilder.LOAD_ALL
.equals(scriptStrategy)) {
viewResources.setProcessScripts(false);
- try {
- viewResources
- .addScript(internetResourceBuilder
- .createResource(
- this,
- InternetResourceBuilder.COMMON_FRAMEWORK_SCRIPT)
- .getUri(context, null));
- viewResources
- .addScript(internetResourceBuilder
- .createResource(
- this,
- InternetResourceBuilder.COMMON_UI_SCRIPT)
- .getUri(context, null));
+ // For an "ALL" strategy, it is not necessary to load scripts in the ajax
request
+ if (!this.isAjaxRequest(context)) {
+ try {
+ viewResources
+ .addScript(internetResourceBuilder
+ .createResource(
+ this,
+ InternetResourceBuilder.COMMON_FRAMEWORK_SCRIPT)
+ .getUri(context, null));
+ viewResources
+ .addScript(internetResourceBuilder
+ .createResource(
+ this,
+ InternetResourceBuilder.COMMON_UI_SCRIPT)
+ .getUri(context, null));
- } catch (ResourceNotFoundException e) {
- if(log.isWarnEnabled()){
- log.warn("No aggregated javaScript library found "+e.getMessage());
+ } catch (ResourceNotFoundException e) {
+ if (log.isWarnEnabled()) {
+ log
+ .warn("No aggregated javaScript library found "
+ + e.getMessage());
+ }
}
+
}
}
}
@@ -360,39 +366,43 @@
} else if (InternetResourceBuilder.LOAD_ALL
.equals(styleStrategy)) {
viewResources.setProcessStyles(false);
-
- String commonStyle = InternetResourceBuilder.COMMON_STYLE_PREFIX;
-
- if (useStdControlsSkinning || useStdControlsSkinningClasses) {
- if (useExtendedSkinning) {
- commonStyle += "-ext";
- } else {
- commonStyle += "-bas";
+ // For an "ALL" strategy, it is not necessary to load styles
+ // in the ajax request
+ if (!this.isAjaxRequest(context)) {
+ String commonStyle = InternetResourceBuilder.COMMON_STYLE_PREFIX;
+
+ if (useStdControlsSkinning
+ || useStdControlsSkinningClasses) {
+ if (useExtendedSkinning) {
+ commonStyle += "-ext";
+ } else {
+ commonStyle += "-bas";
+ }
+
+ if (useStdControlsSkinning
+ && useStdControlsSkinningClasses) {
+ commonStyle += "-both";
+ } else if (useStdControlsSkinning) {
+ commonStyle += "-styles";
+ } else if (useStdControlsSkinningClasses) {
+ commonStyle += "-classes";
+ }
}
- if (useStdControlsSkinning && useStdControlsSkinningClasses) {
- commonStyle += "-both";
- } else if (useStdControlsSkinning) {
- commonStyle += "-styles";
- } else if (useStdControlsSkinningClasses) {
- commonStyle += "-classes";
+ commonStyle += InternetResourceBuilder.COMMON_STYLE_EXTENSION;
+
+ try {
+ viewResources.addStyle(internetResourceBuilder
+ .createResource(this, commonStyle).getUri(
+ context, null));
+
+ } catch (ResourceNotFoundException e) {
+ if (log.isWarnEnabled()) {
+ log.warn("No aggregated stylesheet found "
+ + e.getMessage());
+ }
}
- }
-
- commonStyle += InternetResourceBuilder.COMMON_STYLE_EXTENSION;
-
- try {
- viewResources
- .addStyle(internetResourceBuilder
- .createResource(
- this,
- commonStyle)
- .getUri(context, null));
- } catch (ResourceNotFoundException e) {
- if(log.isWarnEnabled()){
- log.warn("No aggregated stylesheet found "+e.getMessage());
- }
}
} else {
if (useStdControlsSkinning) {
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-19 19:21:06 UTC (rev 8643)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-19 20:45:33 UTC (rev 8644)
@@ -213,7 +213,7 @@
class="#{valueStyle} rich-combobox-input-inactive
#{inputInactiveClass}" type="text"
readonly="#{enableManualInput}"
value="#{value}"
- onblur="#{component.attributes['onblur']}"
+ x:onblur="#{component.attributes['onblur']}"
style="width:#{correction}; #{inputInactiveStyle}"
autocomplete="off"
tabindex="#{component.attributes['tabindex']}"