summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zara <ondrej.zara@gmail.com>2013-12-30 23:05:08 +0100
committerOndrej Zara <ondrej.zara@gmail.com>2013-12-30 23:05:08 +0100
commit53d32852bc0f7ebe3e1567a2ae93fea8f31f2e7f (patch)
tree879109cb20b04be90676d4b774e78743ac4a0fa8
parent9733e55b851b40d0f4e7ef6b1dd70c752ab994ab (diff)
downloadwwwsqldesigner-53d32852bc0f7ebe3e1567a2ae93fea8f31f2e7f.zip
wwwsqldesigner-53d32852bc0f7ebe3e1567a2ae93fea8f31f2e7f.tar.gz
wwwsqldesigner-53d32852bc0f7ebe3e1567a2ae93fea8f31f2e7f.tar.bz2
better ie11 activex detectoin
-rw-r--r--js/wwwsqldesigner.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/wwwsqldesigner.js b/js/wwwsqldesigner.js
index 2364bf1..def3265 100644
--- a/js/wwwsqldesigner.js
+++ b/js/wwwsqldesigner.js
@@ -1352,7 +1352,7 @@ SQL.IO.prototype.clientload = function() {
if (window.DOMParser) {
var parser = new DOMParser();
var xmlDoc = parser.parseFromString(xml, "text/xml");
- } else if (window.ActiveXObject) {
+ } else if (window.ActiveXObject || "ActiveXObject" in window) {
var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
xmlDoc.loadXML(xml);
} else {
@@ -1413,7 +1413,7 @@ SQL.IO.prototype.clientlocalload = function() {
if (window.DOMParser) {
var parser = new DOMParser();
var xmlDoc = parser.parseFromString(xml, "text/xml");
- } else if (window.ActiveXObject) {
+ } else if (window.ActiveXObject || "ActiveXObject" in window) {
var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
xmlDoc.loadXML(xml);
} else {
@@ -1447,7 +1447,7 @@ SQL.IO.prototype.finish = function(xslDoc) {
xsl.importStylesheet(xslDoc);
var result = xsl.transformToDocument(xmlDoc);
sql = result.documentElement.textContent;
- } else if (window.ActiveXObject) {
+ } else if (window.ActiveXObject || "ActiveXObject" in window) {
var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
xmlDoc.loadXML(xml);
sql = xmlDoc.transformNode(xslDoc);