diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-14 10:18:39 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-01-14 10:18:39 +0200 |
| commit | 032bcef30f5ada7dc1ca6eade07ee596afa25bb3 (patch) | |
| tree | a036581c2b7ae7e82fdd60ba92b2fe392b85df7a /WebContent | |
| parent | 8a544b5a6e78337b24a5e56bcde1a21ff6087fae (diff) | |
| parent | b356e7e3bba9b08ad9d1ecdfb4d628b8179ef20a (diff) | |
| download | vaadin-framework-032bcef30f5ada7dc1ca6eade07ee596afa25bb3.tar.gz vaadin-framework-032bcef30f5ada7dc1ca6eade07ee596afa25bb3.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
client/src/com/vaadin/client/communication/AtmospherePushConnection.java
server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
shared/src/com/vaadin/shared/util/SharedUtil.java
Change-Id: I300b5a92bde562390a56b720adf9a37b795c9513
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/tests-valo/uiDependency.css | 0 | ||||
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 8 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo/uiDependency.css b/WebContent/VAADIN/themes/tests-valo/uiDependency.css new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo/uiDependency.css diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 53b213e110..89514dbcc2 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -136,7 +136,7 @@ params += extraParams; } - params += '&' + vaadin.getBrowserDetailsParameters(appId); + params += '&' + vaadin.getBrowserDetailsParameters(appId, getConfig('sendUrlsAsParameters')); var r; try { @@ -270,7 +270,7 @@ ws.pendingApps = null; } }, - getBrowserDetailsParameters: function(parentElementId) { + getBrowserDetailsParameters: function(parentElementId, sendUrlsAsParameters) { // Screen height and width var params = 'v-sh=' + window.screen.height; params += '&v-sw=' + window.screen.width; @@ -327,7 +327,9 @@ } // Location - params += '&v-loc=' + encodeURIComponent(location.href); + if (sendUrlsAsParameters !== false) { + params += '&v-loc=' + encodeURIComponent(location.href); + } // Window name if (window.name) { |