summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/navigator
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-11-12 12:52:17 +0200
committerJohannes Dahlström <johannesd@vaadin.com>2012-11-12 12:52:17 +0200
commit960972e41f9cb0b59aa6a24a882d52bf7940d5f6 (patch)
treef149216eee731a29aa26e347fd2a136402f8cfc2 /server/src/com/vaadin/navigator
parentc6fce8f5ea541625483a988b193935a6ae886a10 (diff)
downloadvaadin-framework-960972e41f9cb0b59aa6a24a882d52bf7940d5f6.tar.gz
vaadin-framework-960972e41f9cb0b59aa6a24a882d52bf7940d5f6.zip
Call ViewDisplay.showView before View.enter in Navigator.navigateTo (#10132)
Change-Id: I48ecb305166557f1671bdd635c25f17b8f490297
Diffstat (limited to 'server/src/com/vaadin/navigator')
-rw-r--r--server/src/com/vaadin/navigator/Navigator.java6
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);
}