From b134f59eb12db00efb3088274f2a0fbc31a5e9fc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 10 Jan 2015 08:23:58 -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 7f86477..e046f5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
- Fix bug where some valid text in a message was handled as uuencoded attachment
- Fix wrong icon for download button in classic skin
- Fix bug where sent message was saved in Sent folder even if disabled by user (#1490208)
+- Fix checks based on window.ActiveXObject in IE > 10
RELEASE 1.0.4
-------------
diff --git a/program/js/app.js b/program/js/app.js
index 70a4850..43e3dd4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7680,7 +7680,7 @@
if (plugin && plugin.enabledPlugin)
return 1;
- if (window.ActiveXObject) {
+ if ('ActiveXObject' in window) {
try {
if (axObj = new ActiveXObject("AcroPDF.PDF"))
return 1;
@@ -7713,7 +7713,7 @@
if (plugin && plugin.enabledPlugin)
return 1;
- if (window.ActiveXObject) {
+ if ('ActiveXObject' in window) {
try {
if (axObj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
return 1;
diff --git a/program/js/common.js b/program/js/common.js
index 72a68bb..977eb90 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -93,7 +93,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