package com.vaadin.terminal;
+import com.vaadin.ui.JavascriptCallback;
+
public class AbstractJavascriptExtension extends AbstractExtension {
+ private JavascriptRpcHelper rpcHelper = new JavascriptRpcHelper(this);
+
+ protected void registerRpc(JavascriptCallback javascriptCallback,
+ String functionName) {
+ rpcHelper.registerRpc(javascriptCallback, functionName);
+ }
+ protected void callRpcFunction(String name, Object... arguments) {
+ rpcHelper.callRpcFunction(name, arguments);
+ }
}
--- /dev/null
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.terminal;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.vaadin.external.json.JSONArray;
+import com.vaadin.tools.ReflectTools;
+import com.vaadin.ui.JavascriptCallback;
+import com.vaadin.ui.JavascriptManager.JavascriptCallbackRpc;
+
+public class JavascriptRpcHelper {
+
+ private static final Method CALL_METHOD = ReflectTools.findMethod(
+ JavascriptCallbackRpc.class, "call", String.class, JSONArray.class);
+ private AbstractClientConnector connector;
+
+ private Map<String, JavascriptCallback> callbacks = new HashMap<String, JavascriptCallback>();
+ private JavascriptCallbackRpc javascriptCallbackRpc;
+
+ public JavascriptRpcHelper(AbstractClientConnector connector) {
+ this.connector = connector;
+ }
+
+ public void registerRpc(JavascriptCallback javascriptCallback,
+ String functionName) {
+ callbacks.put(functionName, javascriptCallback);
+ ensureRpc();
+ }
+
+ private void ensureRpc() {
+ if (javascriptCallbackRpc == null) {
+ javascriptCallbackRpc = new JavascriptCallbackRpc() {
+ public void call(String name, JSONArray arguments) {
+ JavascriptCallback callback = callbacks.get(name);
+ callback.call(arguments);
+ }
+ };
+ connector.registerRpc(javascriptCallbackRpc);
+ }
+ }
+
+ public void callRpcFunction(String name, Object... arguments) {
+ JSONArray args = new JSONArray(Arrays.asList(arguments));
+ connector.addMethodInvocationToQueue(
+ JavascriptCallbackRpc.class.getName(), CALL_METHOD,
+ new Object[] { name, args });
+ }
+
+}
},
'getRpcProxyFunction': function(iface, method) {
return $entry(function() {
- h.@com.vaadin.terminal.gwt.client.JavascriptConnectorHelper::fireRpc(Ljava/lang/String;Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(iface, method, arguments);
+ if (method == undefined) {
+ var args = [iface, Array.prototype.slice.call(arguments, 0)];
+ iface = "com.vaadin.ui.JavascriptManager$JavascriptCallbackRpc";
+ method = "call";
+ } else {
+ var args = arguments;
+ }
+
+ h.@com.vaadin.terminal.gwt.client.JavascriptConnectorHelper::fireRpc(Ljava/lang/String;Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(iface, method, args);
});
},
'registerRpc': function(iface, rpcHandler) {
public void invokeJsRpc(MethodInvocation invocation,
JSONArray parametersJson) {
- invokeJsRpc(rpcMap, invocation.getInterfaceName(),
- invocation.getMethodName(),
- parametersJson.getJavaScriptObject());
+ if ("com.vaadin.ui.JavascriptManager$JavascriptCallbackRpc"
+ .equals(invocation.getInterfaceName())
+ && "call".equals(invocation.getMethodName())) {
+ invokeJsRpc(rpcMap, parametersJson.get(0).isString().stringValue(),
+ null, parametersJson.get(1).isArray().getJavaScriptObject());
+ } else {
+ invokeJsRpc(rpcMap, invocation.getInterfaceName(),
+ invocation.getMethodName(),
+ parametersJson.getJavaScriptObject());
+ }
}
private static native void invokeJsRpc(JavaScriptObject rpcMap,
}
for(var i = 0; i < targets.length; i++) {
var target = targets[i];
- target[methodName].apply(target, parameters);
+ if (methodName === null && typeof target === 'function') {
+ target.apply($wnd, parameters);
+ } else {
+ target[methodName].apply(target, parameters);
+ }
}
}-*/;
*/
package com.vaadin.ui;
+import com.vaadin.terminal.JavascriptRpcHelper;
+
public class AbstractJavascriptComponent extends AbstractComponent {
+ private JavascriptRpcHelper rpcHelper = new JavascriptRpcHelper(this);
+
+ protected void registerRpc(JavascriptCallback javascriptCallback,
+ String functionName) {
+ rpcHelper.registerRpc(javascriptCallback, functionName);
+ }
+ protected void callRpcFunction(String name, Object... arguments) {
+ rpcHelper.callRpcFunction(name, arguments);
+ }
}