diff options
author | Henrik Paul <henrik@vaadin.com> | 2015-03-04 10:01:31 +0200 |
---|---|---|
committer | Henrik Paul <henrik@vaadin.com> | 2015-03-04 16:07:29 +0200 |
commit | dc760a8a2cd74642c5e188ad7f890cb43047a6ad (patch) | |
tree | 41902bbe0b4e7939f8292100415b84af4025024b /server/src/com/vaadin/ui/JavaScriptFunction.java | |
parent | b4a5adca6c2d69bb521ae71fd584bef7a320e7d0 (diff) | |
parent | 6e6dd6ff0d64917effed33c7253c3b135183c355 (diff) | |
download | vaadin-framework-dc760a8a2cd74642c5e188ad7f890cb43047a6ad.tar.gz vaadin-framework-dc760a8a2cd74642c5e188ad7f890cb43047a6ad.zip |
Merge branch 'master' into HEAD
Change-Id: Id48abba25a16fe7f8e679e5ce2ab3ab536951676
Diffstat (limited to 'server/src/com/vaadin/ui/JavaScriptFunction.java')
-rw-r--r-- | server/src/com/vaadin/ui/JavaScriptFunction.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java index c006a36d58..071c88350b 100644 --- a/server/src/com/vaadin/ui/JavaScriptFunction.java +++ b/server/src/com/vaadin/ui/JavaScriptFunction.java @@ -19,6 +19,7 @@ package com.vaadin.ui; import java.io.Serializable; import com.vaadin.server.AbstractJavaScriptExtension; + import elemental.json.JsonArray; /** @@ -26,9 +27,9 @@ import elemental.json.JsonArray; * the corresponding JavaScript function is called, the {@link #call(JsonArray)} * method is invoked. * - * @see JavaScript#addFunction(String, JavaScriptCallback) - * @see AbstractJavaScriptComponent#addFunction(String, JavaScriptCallback) - * @see AbstractJavaScriptExtension#addFunction(String, JavaScriptCallback) + * @see JavaScript#addFunction(String, JavaScriptFunction) + * @see AbstractJavaScriptComponent#addFunction(String, JavaScriptFunction) + * @see AbstractJavaScriptExtension#addFunction(String, JavaScriptFunction) * * @author Vaadin Ltd * @since 7.0.0 |