diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-11-13 10:57:59 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-13 10:57:59 +0000 |
| commit | b3cf8a0806b95e27f210ba3498cebe1027bfc8f6 (patch) | |
| tree | a10c6e283c306f4be56c8b3a2188528edaa97824 /server/src/com | |
| parent | d8c6c4cfefff20d20d3c269a47714d42dc26ba1d (diff) | |
| parent | 960972e41f9cb0b59aa6a24a882d52bf7940d5f6 (diff) | |
| download | vaadin-framework-b3cf8a0806b95e27f210ba3498cebe1027bfc8f6.tar.gz vaadin-framework-b3cf8a0806b95e27f210ba3498cebe1027bfc8f6.zip | |
Merge "Call ViewDisplay.showView before View.enter in Navigator.navigateTo (#10132)"
Diffstat (limited to 'server/src/com')
| -rw-r--r-- | server/src/com/vaadin/navigator/Navigator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java index 4b2474a0f2..811a09fcfb 100644 --- a/server/src/com/vaadin/navigator/Navigator.java +++ b/server/src/com/vaadin/navigator/Navigator.java @@ -497,13 +497,13 @@ public class Navigator implements Serializable { } } - view.enter(event); - currentView = view; - if (display != null) { display.showView(view); } + view.enter(event); + currentView = view; + fireAfterViewChange(event); } |