Merge pull request #6027 from hieupham007/timob-17613-3_4_X

[TIMOB-17613]: Revert TIMOB-10837
tidev · Sep 7, 2014 · 474625a · 474625a
2 parents 9949832 + 208c8fb
commit 474625a
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiWebViewBinding.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/webview/TiWebViewBinding.java
@@ -14,8 +14,6 @@
 import java.util.Stack;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollEventCallback;
@@ -148,18 +146,8 @@ synchronized public String getJSValue(String expression)
 	{
 		// Don't try to evaluate js code again if the binding has already been destroyed
 		if (!destroyed) {
-			// see if this is an expression or a statement block
-			// Match ; followed by 0 or even quotes
-			Pattern pattern = Pattern.compile(";(?=([^\"]*\"[^\"]*\")*[^\"]*$)");
-			Matcher matcher = pattern.matcher(expression);
-			if (matcher.find()) {
-				String lastStmt = expression.substring(matcher.end(matcher.groupCount() - 1));
-				String stmtBlock = expression.substring(0, matcher.end(matcher.groupCount() - 1));
-				expression = stmtBlock + " return " + lastStmt;
-			} else {
-				expression = " return " + expression;
-			}
-			String code = "_TiReturn.setValue((function(){try{" + expression + "+\"\";}catch(ti_eval_err){return '';}})());";
+			String code = "_TiReturn.setValue((function(){try{return " + expression
+					+ "+\"\";}catch(ti_eval_err){return '';}})());";
 			Log.d(TAG, "getJSValue:" + code, Log.DEBUG_MODE);
 			returnSemaphore.drainPermits();
 			synchronized (codeSnippets) {