aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-10-05 13:08:28 +0000
committerVaadin Code Review <review@vaadin.com>2012-10-05 13:08:28 +0000
commit0cb5b208589d756275772297250b20d435cbabac (patch)
tree69ef0d35ba15e0407f42502b6297613971dcd214 /WebContent/VAADIN
parentd0f1a30648a9092fc65fe9f55842811342efd7be (diff)
parente80c00ebd8f2c72f197074c4d1192d702539c8d0 (diff)
downloadvaadin-framework-0cb5b208589d756275772297250b20d435cbabac.tar.gz
vaadin-framework-0cb5b208589d756275772297250b20d435cbabac.zip
Merge "Add Page.getLocation() (#9249)"
Diffstat (limited to 'WebContent/VAADIN')
-rw-r--r--WebContent/VAADIN/vaadinBootstrap.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index fc1de31bc8..3fff0bd829 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -249,11 +249,9 @@
url += '&vh=' + pe.offsetHeight;
}
- // Uri fragment
- if (location.hash) {
- //Remove initial #
- url += '&fr=' + encodeURIComponent(location.hash.replace(/^#/, ""));
- }
+ // Location
+ url += '&loc=' + encodeURIComponent(location.href);
+
// Window name
if (window.name) {
url += '&wn=' + encodeURIComponent(window.name);