[richfaces-svn-commits] JBoss Rich Faces SVN: r5737 - in trunk: ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.

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

Author: maksimkaszynski
Date: 2008-01-30 10:07:51 -0500 (Wed, 30 Jan 2008)
New Revision: 5737

Modified:
   trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/ValueBindingExpression.java
   trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts/data-table.js
Log:
fixed ValueBindingExpression

Modified: trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/ValueBindingExpression.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/ValueBindingExpression.java	2008-01-30 14:35:31 UTC (rev 5736)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/ValueBindingExpression.java	2008-01-30 15:07:51 UTC (rev 5737)
@@ -1,5 +1,7 @@
 package org.richfaces.model.impl.expressive;
 
+import java.util.Map;
+
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;
 import javax.el.ValueExpression;
@@ -20,6 +22,7 @@
 	private ValueExpression valueExpression;
 	private VariableMapper mapper;
 	private ExpressionFactory factory;
+	private Map<String, Object> requestMap;
 	/**
 	 * @param n
 	 * @param application
@@ -36,6 +39,7 @@
 		valueExpression = expressionFactory.createValueExpression(context, expressionString, Object.class);
 		mapper = context.getVariableMapper();
 		factory = expressionFactory;
+		requestMap = faces.getExternalContext().getRequestMap();
 	}
 	
 	ValueBindingExpression(FacesContext faces, ValueExpression valueExpression, String var) {
@@ -46,10 +50,12 @@
 		this.valueExpression = valueExpression;
 		mapper = context.getVariableMapper();
 		factory = expressionFactory;
+		requestMap = faces.getExternalContext().getRequestMap();
 	}
 
 	public Object evaluate(Object base) {
-		mapper.setVariable(var, factory.createValueExpression(base, Object.class));
+		//mapper.setVariable(var, factory.createValueExpression(base, Object.class));
+		requestMap.put(var, base);
 		return valueExpression.getValue(context);
 	}
 }
\ No newline at end of file

Modified: trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts/data-table.js
===================================================================
--- trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts/data-table.js	2008-01-30 14:35:31 UTC (rev 5736)
+++ trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts/data-table.js	2008-01-30 15:07:51 UTC (rev 5737)
@@ -100,7 +100,7 @@
 		element.observe("click", this.onclick);
 	},
 	getElement : function () {
-		return $($(this.id).parentNode);
+		return $($(this.id)/*.parentNode*/);
 	}, 
 	displaySortedAscending : function() {
 		this.getElement()