JBoss Rich Faces SVN: r11220 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2008-11-18 10:44:24 -0500 (Tue, 18 Nov 2008)
New Revision: 11220
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
https://jira.jboss.org/jira/browse/RF-4899
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-18 15:13:49 UTC (rev 11219)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-11-18 15:44:24 UTC (rev 11220)
@@ -777,6 +777,20 @@
} else if(typeof(A4J.AJAX.onError)== "function"){
req._onerror = A4J.AJAX.onError;
}
+
+ var _queueonerror = options.queueonerror;
+ if (_queueonerror) {
+ var _onerror = req._onerror;
+ if (_onerror) {
+ req._onerror = function() {
+ _queueonerror.call(arguments);
+ _onerror.call(arguments);
+ };
+ } else {
+ req._onerror = _queueonerror;
+ }
+ }
+
req.onfinish = A4J.AJAX.finishRequest;
LOG.debug("NEW AJAX REQUEST !!! with form: " + (form.id || form.name || form));
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 15:13:49 UTC (rev 11219)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 15:44:24 UTC (rev 11220)
@@ -413,10 +413,12 @@
submit: function() {
this.query.appendParameter("AJAX:EVENTS_COUNT", this.eventsCount);
var request = A4J.AJAX.SubmitQuery(this.query, this.options)
- request.queue = this.queue;
+ var queue = this.queue;
+ request.queue = queue;
+
if (this.options.queueonsubmit) {
- this.options.queueonsubmit.call(this.queue, request);
+ this.options.queueonsubmit.call(queue, request);
}
return request;
17 years, 5 months
JBoss Rich Faces SVN: r11219 - trunk/docs/common-resources/en/src/main/css.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-11-18 10:13:49 -0500 (Tue, 18 Nov 2008)
New Revision: 11219
Modified:
trunk/docs/common-resources/en/src/main/css/html-release.css
trunk/docs/common-resources/en/src/main/css/html.css
Log:
https://jira.jboss.org/jira/browse/RF-4107 - one resources folder was added
Modified: trunk/docs/common-resources/en/src/main/css/html-release.css
===================================================================
--- trunk/docs/common-resources/en/src/main/css/html-release.css 2008-11-18 14:50:48 UTC (rev 11218)
+++ trunk/docs/common-resources/en/src/main/css/html-release.css 2008-11-18 15:13:49 UTC (rev 11219)
@@ -111,14 +111,35 @@
font-size:14px;
font-family:monospace;
}
-a.new {
-background:transparent url(../images/new.png) no-repeat scroll right top;
-padding-right:70px;
+.new, .added {
+background:transparent url(../images/new.png) no-repeat scroll right top;
+padding-right:70px;
+}
+.updated, .changed {
+background:transparent url(../images/updated.png) no-repeat scroll right top;
+padding-right:70px;
}
-a.updated {
-background:transparent url(../images/updated.png) no-repeat scroll right top;
-padding-right:70px;
-}
+span.diffmkwrapper{
+ background-color: #cce2f6;
+}
+
+div.diffmkwrapper p{
+ background-color: #c8d7e4;
+ padding:0px;
+ margin-left:56px;
+}
+h1, h2, h3, h4, h5, h6{
+ display:inline;
+}
+.img_marker{
+ display:inline;
+ padding: 0px;
+ margin:0px;
+}
+h1.title {
+display:block;
+}
+
.tbi {color: #aaaaaa;}
.tbi p {color: #333333;}
Modified: trunk/docs/common-resources/en/src/main/css/html.css
===================================================================
--- trunk/docs/common-resources/en/src/main/css/html.css 2008-11-18 14:50:48 UTC (rev 11218)
+++ trunk/docs/common-resources/en/src/main/css/html.css 2008-11-18 15:13:49 UTC (rev 11219)
@@ -123,14 +123,7 @@
font-size:14px;
font-family:monospace;
}
-a.new {
-background:transparent url(../images/new.png) no-repeat scroll right top;
-padding-right:70px;
-}
-a.updated {
-background:transparent url(../images/updated.png) no-repeat scroll right top;
-padding-right:70px;
-}
+
.tbi {color: #aaaaaa;}
.tbi p {color: #333333;}
17 years, 5 months
JBoss Rich Faces SVN: r11218 - trunk/docs.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-11-18 09:50:48 -0500 (Tue, 18 Nov 2008)
New Revision: 11218
Modified:
trunk/docs/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-4107 - one resources folder was added
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2008-11-18 14:49:59 UTC (rev 11217)
+++ trunk/docs/pom.xml 2008-11-18 14:50:48 UTC (rev 11218)
@@ -63,11 +63,6 @@
<module>cdkguide</module>
<module>faq</module>
<module>migrationguide</module>
- <!--
- <module>xslt</module>
- <module>docbook</module>
- <module>maven-docbook-plugin</module>
- -->
</modules>
</profile>
<profile>
17 years, 5 months
JBoss Rich Faces SVN: r11217 - in trunk/docs: faq and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-11-18 09:49:59 -0500 (Tue, 18 Nov 2008)
New Revision: 11217
Removed:
trunk/docs/xslt/
Modified:
trunk/docs/faq/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-4107 - one resources folder was added
Modified: trunk/docs/faq/pom.xml
===================================================================
--- trunk/docs/faq/pom.xml 2008-11-18 14:46:12 UTC (rev 11216)
+++ trunk/docs/faq/pom.xml 2008-11-18 14:49:59 UTC (rev 11217)
@@ -120,7 +120,7 @@
</sourceDirectory>
<imageResource>
<directory>
- ${basedir}/src/main/resources
+ ${project.build.directory}/common-resources
</directory>
</imageResource>
<cssResource>
17 years, 5 months
JBoss Rich Faces SVN: r11216 - trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-11-18 09:46:12 -0500 (Tue, 18 Nov 2008)
New Revision: 11216
Modified:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
Log:
some regexp fixes
Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
===================================================================
--- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:41:00 UTC (rev 11215)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:46:12 UTC (rev 11216)
@@ -48,7 +48,7 @@
private final static String SPECIFIC_SCRIPT_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.js";
private final static String SPECIFIC_XCSS_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.xcss";
- private final static String REGEXP = "\\<(script|link|img)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>";
+ private final static Pattern REGEXP = Pattern.compile("\\<(script|link|img|iframe)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>", Pattern.CASE_INSENSITIVE);
/**
* @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs()
@@ -115,18 +115,17 @@
String scriptSuffix = getSriptMappingSuffix();
String cssSuffix = getCssMappingSuffix();
- Pattern pattern = Pattern.compile(REGEXP, Pattern.CASE_INSENSITIVE);
+ Pattern pattern = REGEXP;
try {
while (br.ready()) {
String line = br.readLine();
-
Matcher matcher = pattern.matcher(line);
if (matcher.find()){
String tagName = matcher.group(1);
- if(scriptSuffix != null && tagName.toLowerCase().equals("script")){
+ if(scriptSuffix != null && (tagName.toLowerCase().equals("script")||tagName.toLowerCase().equals("iframe"))){
String path = matcher.group(2);
String extension = matcher.group(3);
line = line.replace(path + "." + extension, path + "." + extension + scriptSuffix);
@@ -143,7 +142,7 @@
if(cssSuffix != null && tagName.toLowerCase().equals("link")){
String path = matcher.group(2);
String extension = matcher.group(3);
- line = line.replace(path + "." + extension, path + "." + "xcss" + cssSuffix);
+ line = line.replace(path + "." + extension, path + "." + (extension.charAt(0)=='c' ? "xcss" : "XCSS") + cssSuffix);
}
}
bw.write(line);
17 years, 5 months
JBoss Rich Faces SVN: r11215 - trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-11-18 09:41:00 -0500 (Tue, 18 Nov 2008)
New Revision: 11215
Modified:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
Log:
Editor: Revert: Add ifame to EditorHTMLRenderer regular expression
Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
===================================================================
--- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:35:13 UTC (rev 11214)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:41:00 UTC (rev 11215)
@@ -48,7 +48,7 @@
private final static String SPECIFIC_SCRIPT_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.js";
private final static String SPECIFIC_XCSS_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.xcss";
- private final static String REGEXP = "\\<(script|link|img|iframe)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>";
+ private final static String REGEXP = "\\<(script|link|img)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>";
/**
* @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs()
@@ -145,12 +145,6 @@
String extension = matcher.group(3);
line = line.replace(path + "." + extension, path + "." + "xcss" + cssSuffix);
}
-
- if(scriptSuffix != null && tagName.toLowerCase().equals("iframe")){
- String path = matcher.group(2);
- String extension = matcher.group(3);
- line = line.replace(path + "." + extension, path + "." + extension + scriptSuffix);
- }
}
bw.write(line);
bw.newLine();
17 years, 5 months
JBoss Rich Faces SVN: r11214 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2008-11-18 09:35:13 -0500 (Tue, 18 Nov 2008)
New Revision: 11214
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
Log:
https://jira.jboss.org/jira/browse/RF-4959
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 14:21:35 UTC (rev 11213)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/queue.js 2008-11-18 14:35:13 UTC (rev 11214)
@@ -22,10 +22,21 @@
submit: function() {
var data = this.items.shift();
if (data) {
- this.request = data.submitWithCallback();
+ this.createRequest(data);
}
},
+ createRequest: function(data) {
+ this.request = data.submit();
+ this.requestId = data.getRequestId();
+ this.request.shouldNotifyQueue = true;
+ },
+
+ clearRequest: function() {
+ this.request = undefined;
+ this.requestId = undefined;
+ },
+
getSize: function() {
var size = this.items.length;
@@ -43,25 +54,27 @@
fireFirst: function() {
var data = this.items.shift();
if (data) {
- data.submitWithoutCallback()
+ data.submit()
}
},
addEvent: function(data) {
if (!this.isFull()) {
+
this.items.push(data);
if (!this.request) {
this.submit();
}
+
} else {
//log error
}
},
submitNext: function() {
- this.request = undefined;
-
+ this.clearRequest();
+
if (this.getSize() > 0) {
this.submit();
} else {
@@ -79,6 +92,20 @@
hasNextItem: function() {
return this.items.length != 0;
+ },
+
+ abortCurrentRequest: function() {
+ if (this.request) {
+ this.request.shouldNotifyQueue = false;
+ this.request.abort();
+ this.clearRequest();
+ }
+ },
+
+ abortDupResponces: function(data) {
+ if (!this.hasNextItem() && data.getRequestId() == this.requestId) {
+ this.abortCurrentRequest();
+ }
}
}
}());
@@ -109,22 +136,22 @@
var _this = this;
this.timer = setTimeout(function() {
try {
- _this.transferIfPipelineEmpty();
+ _this.transferIfEmpty();
_this.timer = undefined;
} finally {
_this = undefined;
}
}, delay);
} else {
- this.transferIfPipelineEmpty();
+ this.transferIfEmpty();
}
},
+
+ transferIfEmpty: function() {
+ this.delayPassed = true;
- transferIfPipelineEmpty: function() {
if (this.pipeline.isEmpty()) {
this.pipeline.addEvent(this.pop());
- } else {
- this.delayPassed = true;
}
},
@@ -152,19 +179,23 @@
var FIRE_NEXT = 'fireNext';
return function(data) {
+ if (data.isIgnoreDupResponses()) {
+ this.pipeline.abortDupResponces(data);
+ }
+
var requestId = data.getRequestId();
if (this.requestId == requestId) {
this.data = data;
data.setEventsCounter(++this.eventsCounter);
-
+
this.resetRequestDelay();
} else {
if (this.data) {
this.stopRequestDelay();
this.pipeline.addEvent(this.pop());
}
-
+
if (this.pipeline.isFull()) {
var behavior = data.getSizeExceededBehavior();
if (behavior == DROP_NEW ||
@@ -174,7 +205,7 @@
} else if (behavior == FIRE_NEW ||
(behavior == FIRE_NEXT && !this.pipeline.hasNextItem())) {
- data.submitWithoutCallback();
+ data.submit();
return;
} else if (behavior == DROP_NEXT) {
this.pipeline.dropFirst();
@@ -192,7 +223,6 @@
}()
});
-
//queue constructor
A4J.AJAX.EventQueue = function(name, queueOptions, requestOptions) {
this.name = name;
@@ -380,21 +410,18 @@
};
extend(EventQueueData.prototype, {
- submitWithoutCallback: function() {
+ submit: function() {
this.query.appendParameter("AJAX:EVENTS_COUNT", this.eventsCount);
var request = A4J.AJAX.SubmitQuery(this.query, this.options)
request.queue = this.queue;
+ if (this.options.queueonsubmit) {
+ this.options.queueonsubmit.call(this.queue, request);
+ }
+
return request;
},
- submitWithCallback: function() {
- var request = this.submitWithoutCallback();
- request.shouldNotifyQueue = true;
-
- return request;
- },
-
getRequestId: function() {
return this.options.requestId;
},
@@ -407,16 +434,16 @@
return this.queue.getSizeExceededBehavior();
},
+ isIgnoreDupResponses: function() {
+ return this.options.ignoreDupResponses;
+ },
+
setEventsCounter: function(count) {
this.eventsCount = count;
},
setRequest: function() {
//TODO nick
- },
-
- shouldSubmitWithoutCallback: function() {
- //TODO nick
}
});
17 years, 5 months
JBoss Rich Faces SVN: r11213 - trunk/docs.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-11-18 09:21:35 -0500 (Tue, 18 Nov 2008)
New Revision: 11213
Modified:
trunk/docs/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-4107 - one resources folder was added
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2008-11-18 14:18:58 UTC (rev 11212)
+++ trunk/docs/pom.xml 2008-11-18 14:21:35 UTC (rev 11213)
@@ -58,16 +58,16 @@
<id>docs</id>
<modules>
<module>highlight</module>
- <module>xslt</module>
+ <module>common-resources</module>
+ <module>userguide</module>
+ <module>cdkguide</module>
+ <module>faq</module>
+ <module>migrationguide</module>
<!--
+ <module>xslt</module>
<module>docbook</module>
<module>maven-docbook-plugin</module>
-->
- <module>userguide</module>
- <module>cdkguide</module>
- <module>faq</module>
- <module>migrationguide</module>
-
</modules>
</profile>
<profile>
17 years, 5 months
JBoss Rich Faces SVN: r11212 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-11-18 09:18:58 -0500 (Tue, 18 Nov 2008)
New Revision: 11212
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-11-18 14:18:36 UTC (rev 11211)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-11-18 14:18:58 UTC (rev 11212)
@@ -257,9 +257,12 @@
<servlet-name>Faces Servlet</servlet-name>
</filter-mapping>
+
+
+
<filter-mapping>
<filter-name>extensionsFilter</filter-name>
- <url-pattern>*</url-pattern>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
17 years, 5 months
JBoss Rich Faces SVN: r11211 - trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-11-18 09:18:36 -0500 (Tue, 18 Nov 2008)
New Revision: 11211
Modified:
trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
Log:
Editor: Add ifame to EditorHTMLRenderer regular expression
Modified: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
===================================================================
--- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 13:55:18 UTC (rev 11210)
+++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-11-18 14:18:36 UTC (rev 11211)
@@ -48,7 +48,7 @@
private final static String SPECIFIC_SCRIPT_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.js";
private final static String SPECIFIC_XCSS_RESOURCE_NAME = "org/richfaces/renderkit/html/1$1.xcss";
- private final static String REGEXP = "\\<(script|link|img)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>";
+ private final static String REGEXP = "\\<(script|link|img|iframe)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>";
/**
* @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs()
@@ -145,6 +145,12 @@
String extension = matcher.group(3);
line = line.replace(path + "." + extension, path + "." + "xcss" + cssSuffix);
}
+
+ if(scriptSuffix != null && tagName.toLowerCase().equals("iframe")){
+ String path = matcher.group(2);
+ String extension = matcher.group(3);
+ line = line.replace(path + "." + extension, path + "." + extension + scriptSuffix);
+ }
}
bw.write(line);
bw.newLine();
17 years, 5 months