From b6b2858b0172e54c1b497fae5019a868f8be5934 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 10 Jan 2015 08:20:12 -0500
Subject: [PATCH] Fix checks based on window.ActiveXObject in IE > 10
---
CHANGELOG | 1 +
program/js/common.js | 2 +-
program/js/app.js | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 084ee46..b9d4e41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
- Fix bug where max_group_members was ignored when adding a new contact (#1490214)
- Hide MDN and DSN options in compose if disabled by admin (#1490221)
+- Fix checks based on window.ActiveXObject in IE > 10
RELEASE 1.1-rc
--------------
diff --git a/program/js/app.js b/program/js/app.js
index ece5218..826c2ef 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -8066,7 +8066,7 @@
if (plugin && plugin.enabledPlugin)
return 1;
- if (window.ActiveXObject) {
+ if ('ActiveXObject' in window) {
try {
if (plugin = new ActiveXObject("AcroPDF.PDF"))
return 1;
@@ -8099,7 +8099,7 @@
if (plugin && plugin.enabledPlugin)
return 1;
- if (window.ActiveXObject) {
+ if ('ActiveXObject' in window) {
try {
if (plugin = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
return 1;
diff --git a/program/js/common.js b/program/js/common.js
index 7664306..2b96a8a 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -103,7 +103,7 @@
this.xmlhttp_test = function()
{
var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
- this.xmlhttp = (window.XMLHttpRequest || (window.ActiveXObject && activeX_test()));
+ this.xmlhttp = window.XMLHttpRequest || (('ActiveXObject' in window) && activeX_test());
return this.xmlhttp;
};
--
Gitblit v1.9.1