[richfaces-svn-commits] JBoss Rich Faces SVN: r5397 - branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf.
Author: sergeyhalipov
Date: 2008-01-15 15:46:12 -0500 (Tue, 15 Jan 2008)
New Revision: 5397
Modified:
branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-1771
Modified: branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-01-15
19:37:54 UTC (rev 5396)
+++ branches/3.1.x/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-01-15
20:46:12 UTC (rev 5397)
@@ -902,11 +902,12 @@
var data = request.getJSON('_ajax:data');
try {
var newscript = Sarissa.getText(oncomplete,true);
-// if (window.execScript) {
-// window.execScript( newscript );
-// } else {
+ if (!window.data) {
+ window.data = data;
+ } else {
+ Object.extend(window.data, data);
+ }
window.eval(newscript);
-// }
} catch(e){
LOG.error('Error evaluate oncomplete function '+e.Message);
}