[richfaces-svn-commits] JBoss Rich Faces SVN: r13588 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: ilya_shaikovsky
Date: 2009-04-15 04:57:25 -0400 (Wed, 15 Apr 2009)
New Revision: 13588

Modified:
   trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
Log:
https://jira.jboss.org/jira/browse/RF-6790

Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js	2009-04-15 01:35:33 UTC (rev 13587)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js	2009-04-15 08:57:25 UTC (rev 13588)
@@ -123,38 +123,38 @@
 
 Richfaces.evalMacro = function(template, object)
 {
-	var value="";
+	var _value_="";
 	// variable evaluation
 	if (Richfaces.VARIABLE_NAME_PATTERN.test(template))
 	{
 		if (template.indexOf('.')==-1) {
-			value = object[template];
-			if (!value)	value=window[template];
+			_value_ = object[template];
+			if (!_value_)	_value_=window[template];
 		}
 		// object's variable evaluation
 		else {
-			value = Richfaces.getObjectValue(template, object);
-			if (!value) value=Richfaces.getObjectValue(template, window);
+			_value_ = Richfaces.getObject_value_(template, object);
+			if (!_value_) _value_=Richfaces.getObject_value_(template, window);
 		}
-		if (value && typeof value=='function') value = value(object);
-		if (!value) value=""; 		
+		if (_value_ && typeof _value_=='function') _value_ = _value_(object);
+		if (!_value_) _value_=""; 		
 	}
 	//js string evaluation
 	else {
 		try {
 			if (Richfaces.browser.isObjectEval) {
-				value = object.eval(template);
+				_value_ = object.eval(template);
 			}
 			else with (object) {
-					value = eval(template) ;
+					_value_ = eval(template) ;
 			}
 			
-			if (typeof value == 'function') {
-				value = value(object);
+			if (typeof _value_ == 'function') {
+				_value_ = _value_(object);
 			}
 		} catch (e) { LOG.warn("Exception: "+e.Message + "\n[" + template + "]"); }
 	}
-	return value;
+	return _value_;
 }
 Richfaces.evalSimpleMacro = function(template, object)
 {