diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 11:56:53 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-03-06 12:29:24 +0200 |
| commit | 741e798633edd584e62bcb4e6a00911a86908cdf (patch) | |
| tree | 22d3b4c625376ba7f79ec82488a64f1696539d5b /server/src/com/vaadin/ui/JavaScriptFunction.java | |
| parent | 3c84a54591d792b69a4d6d736714941edb1d818a (diff) | |
| parent | 4db0b55aefd83d149e62a7fad2b14fb232d976c8 (diff) | |
| download | vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.tar.gz vaadin-framework-741e798633edd584e62bcb4e6a00911a86908cdf.zip | |
Merge branch 'master' into grid-columnreorder
Conflicts:
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
Change-Id: Ic77c717b9bbdcc38585382d4944ee4491aba3f7d
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 |