From 077201a83ce98a3dc328bd8c1d8ce1201c4ed8fd Mon Sep 17 00:00:00 2001 From: Grant Gayed Date: Fri, 6 Jan 2012 16:44:34 -0500 Subject: fix Browser.evaluate() regression introduced by initial fix for bug 352383 --- .../common/org/eclipse/swt/browser/WebBrowser.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java index 1c828e4eb0..656aa7dec1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java @@ -392,21 +392,21 @@ public Object evaluate (String script) throws SWTException { buffer.append (functionName); buffer.append (" == undefined) {window.external.callJava("); // $NON-NLS-1$ buffer.append (index); - buffer.append (','); + buffer.append (",'"); //$NON-NLS-1$ buffer.append (function.token); - buffer.append (", ['"); // $NON-NLS-1$ + buffer.append ("', ['"); // $NON-NLS-1$ buffer.append (ERROR_ID); buffer.append ("']);} else {try {var result = "); // $NON-NLS-1$ buffer.append (functionName); buffer.append ("(); window.external.callJava("); // $NON-NLS-1$ buffer.append (index); - buffer.append (','); + buffer.append (",'"); //$NON-NLS-1$ buffer.append (function.token); - buffer.append (", [result]);} catch (e) {window.external.callJava("); // $NON-NLS-1$ + buffer.append ("', [result]);} catch (e) {window.external.callJava("); // $NON-NLS-1$ buffer.append (index); - buffer.append (','); + buffer.append (",'"); //$NON-NLS-1$ buffer.append (function.token); - buffer.append (", ['"); // $NON-NLS-1$ + buffer.append ("', ['"); // $NON-NLS-1$ buffer.append (ERROR_ID); buffer.append ("' + e.message]);}}"); // $NON-NLS-1$ execute (buffer.toString ()); -- cgit