diff options
Diffstat (limited to 'WebContent/VAADIN/vaadinBootstrap.js')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 81adfcccc6..b2995dd0bd 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -120,6 +120,11 @@ url += '&theme=' + encodeURIComponent(theme); } + var extraParams = getConfig('extraParams') + if (extraParams !== undefined) { + url += extraParams; + } + url += '&' + vaadin.getBrowserDetailsParameters(appId); // Timestamp to avoid caching @@ -295,8 +300,20 @@ } // Detect touch device support - try { document.createEvent("TouchEvent"); url += "&v-td=1";} catch(e){}; - + var supportsTouch = false; + try { + document.createEvent("TouchEvent"); + supportsTouch = true; + } catch (e) { + // Chrome and IE10 touch detection + supportsTouch = 'ontouchstart' in window + || navigator.msMaxTouchPoints; + } + + if (supportsTouch) { + url += "&v-td=1"; + } + return url; } }; |