[richfaces-svn-commits] JBoss Rich Faces SVN: r5224 - trunk/framework/impl/src/main/javascript/ajaxjsf.

[richfaces-svn-commits at lists.jboss.org]

Author: sergeyhalipov
Date: 2008-01-09 09:56:58 -0500 (Wed, 09 Jan 2008)
New Revision: 5224

Modified:
   trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
http://jira.jboss.com/jira/browse/RF-1487

Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js	2008-01-09 14:53:01 UTC (rev 5223)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js	2008-01-09 14:56:58 UTC (rev 5224)
@@ -939,13 +939,13 @@
    				var data = request.getJSON('_ajax:data');
    				try {
 	   				var newscript = Sarissa.getText(oncomplete,true);
+	   				if (!window.data) {
+						window.data = data;
+					} else {
+						Object.extend(window.data, data);
+					}
 					if (event) {
 						var target = event.target ? event.target : event.srcElement;
-						if (!window.data) {
-							window.data = data;
-						} else {
-							Object.extend(window.data, data);
-						}
 						new Function(newscript).apply(target);
 					} else {
 						window.eval(newscript);