From 454f44738b20b22aeeb327523f1306b46d3cbef6 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 10 Aug 2012 10:40:53 +0300 Subject: Revert "Run JavaScript RPC with this pointing to the connector wrapper (#9096)" This reverts commit ab2846641bff895b9e82bfd8068c720e8132e297. This fixes #9280 --- .../vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/com/vaadin') diff --git a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java index 69b8e00603..47dd2df5b2 100644 --- a/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java +++ b/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java @@ -331,9 +331,9 @@ public class JavaScriptConnectorHelper { invokeCallback(getConnectorWrapper(), callbackName, arguments); } else { JavaScriptObject arguments = parametersJson.getJavaScriptObject(); - invokeJsRpc(rpcMap, iface, method, arguments, getConnectorWrapper()); + invokeJsRpc(rpcMap, iface, method, arguments); // Also invoke wildcard interface - invokeJsRpc(rpcMap, "", method, arguments, getConnectorWrapper()); + invokeJsRpc(rpcMap, "", method, arguments); } } @@ -344,8 +344,7 @@ public class JavaScriptConnectorHelper { }-*/; private static native void invokeJsRpc(JavaScriptObject rpcMap, - String interfaceName, String methodName, - JavaScriptObject parameters, JavaScriptObject connector) + String interfaceName, String methodName, JavaScriptObject parameters) /*-{ var targets = rpcMap[interfaceName]; if (!targets) { @@ -353,7 +352,7 @@ public class JavaScriptConnectorHelper { } for(var i = 0; i < targets.length; i++) { var target = targets[i]; - target[methodName].apply(connector, parameters); + target[methodName].apply(target, parameters); } }-*/; -- cgit v1.2.3