summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>2009-11-06 17:46:52 +0000
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>2009-11-06 17:46:52 +0000
commitb3261ba509f9b0ca2c4f7fa422e48225a6e033df (patch)
treef4414919511f9a292b2c0508bfddc8a6737fdae5 /src/com/vaadin
parent54cbda3bb841da85e3f4df4a2318919b91eed1b1 (diff)
downloadvaadin-framework-b3261ba509f9b0ca2c4f7fa422e48225a6e033df.tar.gz
vaadin-framework-b3261ba509f9b0ca2c4f7fa422e48225a6e033df.zip
Cleaned a javascript temp variable from window. Added use warning to javadocs.
svn changeset:9674/svn branch:6.2
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VView.java6
-rw-r--r--src/com/vaadin/ui/Window.java8
2 files changed, 11 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 162d5fa5d7..9cb108acda 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -158,12 +158,12 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
/*-{
try {
if (script == null) return;
- $wnd.evalargs = args;
+ $wnd.vaadin.evalargs = args;
if (args != null)
for (var i=1;i<= args.length;i++)
- script = script.replace("$"+i, "$wnd.evalargs["+(i-1)+"]");
+ script = script.replace("$"+i, "$wnd.vaadin.evalargs["+(i-1)+"]");
eval(script);
- $wnd.evalargs = null;
+ delete $wnd.vaadin.evalargs;
} catch (e) {
}
}-*/;
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index d8f4972104..23666dc287 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -1667,6 +1667,14 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
* </p>
*
* <p>
+ * Use of this method should be avoided. Executing javascript often leads to
+ * cross-browser compatibility issues and regressions that are hard to
+ * resolve. Instead it is recommended to create new widgets with google web
+ * toolkit. For more info on creating own, reusable client-side widgets in
+ * Java, read corresponding chapter on Book of Vaadin.
+ * </p>
+ *
+ * <p>
* The script may contain markers indentified with "$x", where x is a one
* digit number. The number of markers must match to the number of optional
* Paintable reference parameters. The first marker is $1, second $2 and so