diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-06-19 12:23:33 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-06-19 12:23:33 +0300 |
| commit | 26ba3f922fbb01daa35b6f97039335892b896d36 (patch) | |
| tree | 27c59aa81c565efa7b33211f57a346ec662abd23 /src/com/vaadin/ui/JavaScript.java | |
| parent | 6750c529283be82e4f868ca6f389927e577189cf (diff) | |
| download | vaadin-framework-26ba3f922fbb01daa35b6f97039335892b896d36.tar.gz vaadin-framework-26ba3f922fbb01daa35b6f97039335892b896d36.zip | |
Extract API from Root to Page (#8907)
Diffstat (limited to 'src/com/vaadin/ui/JavaScript.java')
| -rw-r--r-- | src/com/vaadin/ui/JavaScript.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/JavaScript.java b/src/com/vaadin/ui/JavaScript.java index 234f37f8a6..241d477506 100644 --- a/src/com/vaadin/ui/JavaScript.java +++ b/src/com/vaadin/ui/JavaScript.java @@ -10,6 +10,7 @@ import java.util.Map; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.terminal.AbstractExtension; +import com.vaadin.terminal.Page; import com.vaadin.terminal.gwt.client.communication.ServerRpc; import com.vaadin.terminal.gwt.client.extensions.javascriptmanager.ExecuteJavaScriptRpc; import com.vaadin.terminal.gwt.client.extensions.javascriptmanager.JavaScriptManagerState; @@ -61,7 +62,11 @@ public class JavaScript extends AbstractExtension { } public static JavaScript getCurrent() { - return Root.getCurrentRoot().getJavaScript(); + Page page = Page.getCurrent(); + if (page == null) { + return null; + } + return page.getJavaScript(); } } |