From b3261ba509f9b0ca2c4f7fa422e48225a6e033df Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Fri, 6 Nov 2009 17:46:52 +0000 Subject: [PATCH] Cleaned a javascript temp variable from window. Added use warning to javadocs. svn changeset:9674/svn branch:6.2 --- src/com/vaadin/terminal/gwt/client/ui/VView.java | 6 +++--- src/com/vaadin/ui/Window.java | 8 ++++++++ 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 { *

* *

+ * 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. + *

+ * + *

* 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 -- 2.39.5