[richfaces-svn-commits] JBoss Rich Faces SVN: r19873 - in branches/RF-7817/ui/core/ui/src/main: templates/org/ajax4jsf/renderkit/html and 1 other directory.
Author: nbelaevski
Date: 2010-11-01 19:59:45 -0400 (Mon, 01 Nov 2010)
New Revision: 19873
Modified:
branches/RF-7817/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
branches/RF-7817/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/push.template.xml
Log:
https://jira.jboss.org/browse/RF-9158
Modified:
branches/RF-7817/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js
===================================================================
---
branches/RF-7817/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2010-11-01
23:50:08 UTC (rev 19872)
+++
branches/RF-7817/ui/core/ui/src/main/resources/META-INF/resources/org.richfaces/push.js 2010-11-01
23:59:45 UTC (rev 19873)
@@ -185,14 +185,14 @@
this.__address = options.address;
this.__handlers = {};
- if (options.dataHandler) {
+ if (options.ondataavailable) {
//TODO check compatibility with f:ajax
- this.__bindDataHandler(options.dataHandler);
+ this.__bindDataHandler(options.ondataavailable);
}
- if (options.errorHandler) {
+ if (options.onerror) {
//TODO check compatibility with f:ajax
- this.__bindErrorHandler(options.errorHandler);
+ this.__bindErrorHandler(options.onerror);
}
richfaces.Push.increaseSubscriptionCounters(this.__address);
Modified:
branches/RF-7817/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/push.template.xml
===================================================================
---
branches/RF-7817/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/push.template.xml 2010-11-01
23:50:08 UTC (rev 19872)
+++
branches/RF-7817/ui/core/ui/src/main/templates/org/ajax4jsf/renderkit/html/push.template.xml 2010-11-01
23:59:45 UTC (rev 19873)
@@ -27,7 +27,11 @@
RichFaces.Push.setPushUrl("#{getPushUrl(facesContext)}");
</c:if>
- new RichFaces.ui.Push("#{clientId}",
#{getOptionsString(facesContext, component)});
+ <cdk:scriptObject name="options">
+ <cdk:scriptOption attributes="address ondataavailable
onerror" />
+ </cdk:scriptObject>
+
+ new RichFaces.ui.Push(#{toScriptArgs(clientId, options)});
</script>
</span>
</cc:implementation>