summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-04-17 11:20:13 +0300
committerLeif Åstrand <leif@vaadin.com>2013-04-18 10:36:45 +0300
commit4f7377be467fc099defc1d3dd0cb1eb656152d6f (patch)
tree998d0274de67b9d9aaac824bd519749727a351f0 /WebContent
parent8fcad2fe496d04b4f4fa6e8eebee673226fe70d4 (diff)
downloadvaadin-framework-4f7377be467fc099defc1d3dd0cb1eb656152d6f.tar.gz
vaadin-framework-4f7377be467fc099defc1d3dd0cb1eb656152d6f.zip
Move push mode to UI and add @Push annotation (#11506)
Change-Id: Idc0e5e00a8f3ddd3f56d87484089c290d52715c2
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/vaadinBootstrap.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index b2995dd0bd..ae50289477 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -120,6 +120,12 @@
url += '&theme=' + encodeURIComponent(theme);
}
+ // Tell the UI what pushMode it is configured to use
+ var pushMode = getConfig('pushMode');
+ if (pushMode !== undefined) {
+ url += '&v-pushMode=' + encodeURIComponent(pushMode);
+ }
+
var extraParams = getConfig('extraParams')
if (extraParams !== undefined) {
url += extraParams;