diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-29 14:19:57 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-29 14:19:57 +0000 |
| commit | cfb2513cd2049d6cae90b6d2c725a03e75194ce9 (patch) | |
| tree | 23ba883503ef150a59cd3478d634bdcfe026c537 | |
| parent | b5f32d1ac780c0901193dc3eee5f80dd245a77ca (diff) | |
| parent | e451bc52fd848bb1cc654b2d250802dd51eb2350 (diff) | |
| download | vaadin-framework-cfb2513cd2049d6cae90b6d2c725a03e75194ce9.tar.gz vaadin-framework-cfb2513cd2049d6cae90b6d2c725a03e75194ce9.zip | |
Merge "Fall back to activex xml http if XMLHttpRequest is disabled (#10423)"
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index c4617df25c..60f1b02452 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -101,7 +101,12 @@ // Timestamp to avoid caching url += '&' + (new Date()).getTime(); - var r = new XMLHttpRequest(); + var r; + try { + r = new XMLHttpRequest(); + } catch (e) { + r = new ActiveXObject("MSXML2.XMLHTTP.3.0"); + } r.open('POST', url, true); r.onreadystatechange = function (aEvt) { if (r.readyState == 4) { |