summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-06-29 15:36:56 +0300
committerHenri Sara <hesara@vaadin.com>2012-06-29 15:36:56 +0300
commit59f1cea4acbee1350757e6ffe4e5da9b983db9e5 (patch)
tree1947edb983aecde6c8e906b952f4d17426ad1c2c /src
parent832bd0247a86a5dbfc4eed421d217db88bdd315f (diff)
parent570401eea6984a9c822a68f0139eba5b4826045f (diff)
downloadvaadin-framework-59f1cea4acbee1350757e6ffe4e5da9b983db9e5.tar.gz
vaadin-framework-59f1cea4acbee1350757e6ffe4e5da9b983db9e5.zip
Merge branch 'master' into gwt
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/ui/JavaScript.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/vaadin/ui/JavaScript.java b/src/com/vaadin/ui/JavaScript.java
index d256717711..5905b56bfb 100644
--- a/src/com/vaadin/ui/JavaScript.java
+++ b/src/com/vaadin/ui/JavaScript.java
@@ -115,6 +115,16 @@ public class JavaScript extends AbstractExtension {
}
/**
+ * Executes the given JavaScript code in the browser.
+ *
+ * @param script
+ * The JavaScript code to run.
+ */
+ public static void eval(String script) {
+ getCurrent().execute(script);
+ }
+
+ /**
* Get the JavaScript object for the current Page, or null if there is no
* current page.
*