11 a.m.
Author: nbelaevski
Date: 2007-09-10 12:00:41 -0400 (Mon, 10 Sep 2007)
New Revision: 2840
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent
trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-862
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent
===================================================================
---
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2007-09-10
15:37:40 UTC (rev 2839)
+++
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_component_attributes.ent 2007-09-10
16:00:41 UTC (rev 2840)
@@ -62,6 +62,11 @@
<classname>java.lang.String</classname>
<description>JavaScript code for call after request completed on client
side</description>
</property>
+ <property>
+ <name>onbeforedomupdate</name>
+ <classname>java.lang.String</classname>
+ <description>JavaScript code for call before DOM has been updated on client
side</description>
+ </property>
<property >
<name>focus</name>
<classname>java.lang.String</classname>
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2007-09-10
15:37:40 UTC (rev 2839)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2007-09-10
16:00:41 UTC (rev 2840)
@@ -83,13 +83,13 @@
/**
* @return value or result of valueBinding of Name of JavaScript function, called
before updating DOM
*/
- public abstract String getBeforeUpdate();
+ public abstract String getOnbeforedomupdate();
/**
* setter method for property
* @param new value of Name of JavaScript function, called before updating DOM to
set
*/
- public abstract void setBeforeUpdate(String beforeUpdate);
+ public abstract void setOnbeforedomupdate(String beforeUpdate);
/**
* setter method for property
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-09-10
15:37:40 UTC (rev 2839)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-09-10
16:00:41 UTC (rev 2840)
@@ -54,7 +54,6 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
-import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.util.ServicesUtils;
import org.apache.commons.logging.Log;
@@ -93,7 +92,7 @@
* Attribute for keep JavaScript function name for call before updating
* DOM tree.
*/
- public static final String BEFOREUPDATE_ATTR_NAME = "beforeupdate";
+ public static final String ONBEFOREDOMUPDATE_ATTR_NAME = "onbeforedomupdate";
/**
@@ -304,10 +303,10 @@
function.addParameter("data");
function.addToBody(oncomplete);
- options.put("oncomplete", function);
+ options.put(ONCOMPLETE_ATTR_NAME, function);
}
- String beforeupdate = getAjaxBeforeUpdate(uiComponent);
+ String beforeupdate = getAjaxOnBeforeDomUpdate(uiComponent);
if (null != beforeupdate) {
JSFunctionDefinition function = new JSFunctionDefinition();
function.addParameter("request");
@@ -315,7 +314,7 @@
function.addParameter("data");
function.addToBody(beforeupdate);
- options.put("beforeupdate", function);
+ options.put(ONBEFOREDOMUPDATE_ATTR_NAME, function);
}
@@ -594,12 +593,12 @@
* for wich calculate function name
* @return name of JavaScript function or <code>null</code>
*/
- public static String getAjaxBeforeUpdate(UIComponent component) {
+ public static String getAjaxOnBeforeDomUpdate(UIComponent component) {
if (component instanceof AjaxComponent) {
- return ((AjaxComponent) component).getBeforeUpdate();
+ return ((AjaxComponent) component).getOnbeforedomupdate();
}
- return (String) component.getAttributes().get(BEFOREUPDATE_ATTR_NAME);
+ return (String) component.getAttributes().get(ONBEFOREDOMUPDATE_ATTR_NAME);
}
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-09-10 15:37:40 UTC
(rev 2839)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-09-10 16:00:41 UTC
(rev 2840)
@@ -688,9 +688,9 @@
if(req.getParserStatus() == Sarissa.PARSED_OK){
// perform beforeupdate if exists
- if(options.beforeupdate){
- LOG.debug( "Call request beforeupdate function before replacing
elemements" );
- options.beforeupdate(req, req.domEvt, req.getJSON('_ajax:data'));
+ if(options.onbeforedomupdate){
+ LOG.debug( "Call request onbeforedomupdate function before replacing
elemements" );
+ options.onbeforedomupdate(req, req.domEvt, req.getJSON('_ajax:data'));
}
var idsFromResponse = req.getResponseHeader("Ajax-Update-Ids");
Modified:
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
---
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-09-10
15:37:40 UTC (rev 2839)
+++
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-09-10
16:00:41 UTC (rev 2840)
@@ -251,7 +251,7 @@
</property>
<property hidden="true">
- <name>beforeUpdate</name>
+ <name>onbeforedomupdate</name>
<classname>java.lang.String</classname>
</property>
Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
===================================================================
--- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-09-10
15:37:40 UTC (rev 2839)
+++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-09-10
16:00:41 UTC (rev 2840)
@@ -269,11 +269,11 @@
public void setSwitchType(String newvalue) {
}
- public String getBeforeUpdate() {
+ public String getOnbeforedomupdate() {
return null;
}
- public void setBeforeUpdate(String beforeUpdate) {
+ public void setOnbeforedomupdate(String beforeUpdate) {
}
}
}
Modified:
trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
---
trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-09-10
15:37:40 UTC (rev 2839)
+++
trunk/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-09-10
16:00:41 UTC (rev 2840)
@@ -165,17 +165,17 @@
eventOptions.put("oncomplete", onComplete);
}
- if(eventOptions.containsKey("beforeupdate")){
- JSFunctionDefinition beforeUpdate =
(JSFunctionDefinition)eventOptions.get("beforeupdate");
+ if(eventOptions.containsKey(AjaxRendererUtils.ONBEFOREDOMUPDATE_ATTR_NAME)){
+ JSFunctionDefinition beforeUpdate =
(JSFunctionDefinition)eventOptions.get(AjaxRendererUtils.ONBEFOREDOMUPDATE_ATTR_NAME);
beforeUpdate.addToBody(fireBeforeUpdateDOM);
- eventOptions.put("beforeupdate", beforeUpdate);
+ eventOptions.put(AjaxRendererUtils.ONBEFOREDOMUPDATE_ATTR_NAME, beforeUpdate);
} else {
JSFunctionDefinition beforeUpdate = new JSFunctionDefinition();
beforeUpdate.addParameter("request");
beforeUpdate.addParameter("event");
beforeUpdate.addParameter("data");
beforeUpdate.addToBody(fireBeforeUpdateDOM);
- eventOptions.put("beforeupdate", beforeUpdate);
+ eventOptions.put(AjaxRendererUtils.ONBEFOREDOMUPDATE_ATTR_NAME, beforeUpdate);
}