diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-04 18:21:03 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-05 14:10:03 +0300 |
| commit | e80c00ebd8f2c72f197074c4d1192d702539c8d0 (patch) | |
| tree | a955befdc9e7fa65bd80467256b7b1318823657a /server/src/com/vaadin/ui/UI.java | |
| parent | ff4ee18e0f26515cfa818ab9d249932a3bbf0955 (diff) | |
| download | vaadin-framework-e80c00ebd8f2c72f197074c4d1192d702539c8d0.tar.gz vaadin-framework-e80c00ebd8f2c72f197074c4d1192d702539c8d0.zip | |
Add Page.getLocation() (#9249)
* Send the whole window location, not just fragment, in bootstrap and when the fragment changes
* BrowserDetails now has URI getLocation() instead of String getUriFragment()
* Keep FragmentChangeListeners as-is, should perhaps change to LocationChangeListeners at some point
* Implement Page.getFragment() by means of Page.getLocation()
* Differentiate between no fragment (null) and empty fragment ("") as java.net.URI does
Change-Id: I1da1ea0664304d0c121a57e85d127fe48605e940
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index ba87eb1424..3cacf5c497 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -680,10 +680,10 @@ public abstract class UI extends AbstractComponentContainer implements actionManager.handleActions(variables, this); } - if (variables.containsKey(UIConstants.FRAGMENT_VARIABLE)) { - String fragment = (String) variables - .get(UIConstants.FRAGMENT_VARIABLE); - getPage().setFragment(fragment, true); + if (variables.containsKey(UIConstants.LOCATION_VARIABLE)) { + String location = (String) variables + .get(UIConstants.LOCATION_VARIABLE); + getPage().updateLocation(location); } } |