diff options
| author | Marc Englund <marc@vaadin.com> | 2013-04-15 10:45:32 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-04-15 12:59:20 +0000 |
| commit | 5dfbd29c46b4b7885e719d9320da0c4894c0a126 (patch) | |
| tree | d0f965270ff6b8fdc8a2c678c5f3fd766c6cd22e | |
| parent | e9466f6bf3b81bf48265e139510213409b3fc613 (diff) | |
| download | vaadin-framework-5dfbd29c46b4b7885e719d9320da0c4894c0a126.tar.gz vaadin-framework-5dfbd29c46b4b7885e719d9320da0c4894c0a126.zip | |
Fixes test (locator) and quiet mode for DebugWindow #11603
Change-Id: If80e903bec9cb4dbd9dc87d0994634f4eaf0b9ae
Ticket: 11603
| -rw-r--r-- | client/src/com/vaadin/client/debug/internal/ConsoleAdapter.java | 13 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/debug/internal/ConsoleAdapter.java b/client/src/com/vaadin/client/debug/internal/ConsoleAdapter.java index 13ec8a43ff..4b9e831ec5 100644 --- a/client/src/com/vaadin/client/debug/internal/ConsoleAdapter.java +++ b/client/src/com/vaadin/client/debug/internal/ConsoleAdapter.java @@ -114,16 +114,23 @@ public class ConsoleAdapter implements Console { window.meta(applicationConnection, meta); } + private boolean quietMode = false; + @Override - public void setQuietMode(boolean quietDebugMode) { - if (quietDebugMode) { + public void setQuietMode(boolean quietMode) { + this.quietMode = quietMode; + if (quietMode) { window.close(); + } else { + // NOP can't switch ATM } } @Override public void init() { - window.init(); + if (!quietMode) { + window.init(); + } } static void handleError(Throwable e, Console target) { diff --git a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html index fb4c266db1..ff5c731e5c 100644 --- a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html +++ b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html @@ -18,7 +18,7 @@ </tr> <tr> <td>assertElementPresent</td> - <td>vaadin=runcomvaadintestsdebugDebugWindowPresent::Root/VDebugConsole[0]</td> + <td>vaadin=runcomvaadintestsdebugDebugWindowPresent::Root/VDebugWindow[0]</td> <td></td> </tr> <tr> |