diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-04 17:30:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-04 17:30:14 +0200 |
| commit | d27607760953d1f973e75850c6338f1f58ce9091 (patch) | |
| tree | 99b74b114b6155879ef8266788031d6666186d0f /js/test/Ice/acm/Client.js | |
| parent | Fix php7 build (diff) | |
| parent | Fixed issue with IE where accessing the stack from Exception.toString leads t... (diff) | |
| download | ice-d27607760953d1f973e75850c6338f1f58ce9091.tar.bz2 ice-d27607760953d1f973e75850c6338f1f58ce9091.tar.xz ice-d27607760953d1f973e75850c6338f1f58ce9091.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'js/test/Ice/acm/Client.js')
| -rw-r--r-- | js/test/Ice/acm/Client.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index e673c0b9e1a..9d4d6764bab 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -442,7 +442,8 @@ if(typeof(navigator) !== "undefined" && (navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Trident/7.0") != -1 || - navigator.userAgent.indexOf("Edge/12") != -1)) + navigator.userAgent.indexOf("Edge/12") != -1 || + navigator.userAgent.indexOf("Edge/13") != -1)) { tests.push(new HeartbeatOnIdleTest(com, out)); tests.push(new HeartbeatAlwaysTest(com, out)); |