From 471a10370f7bd68ec7178a3e4d11fdf936447d4f Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 24 Jan 2014 08:53:20 -0500
Subject: [PATCH] Hotfix: IE 11 compatibility. TODO: upgrade to newer official
jsTree release; may require jQuery upgrade.
---
themes/blueprint/js/jsTree/jquery.jstree.js | 2 +-
themes/bootstrap/js/jsTree/jquery.jstree.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/themes/blueprint/js/jsTree/jquery.jstree.js b/themes/blueprint/js/jsTree/jquery.jstree.js
index b9cadafd332..8d329f39c78 100644
--- a/themes/blueprint/js/jsTree/jquery.jstree.js
+++ b/themes/blueprint/js/jsTree/jquery.jstree.js
@@ -3011,7 +3011,7 @@
// Added LOS 03/04/12
$.vakata.xslt = function (xml, xsl, callback) {
var rs = "", xm, xs, processor, support;
- if(window.ActiveXObject) {
+ if(window.ActiveXObject || "ActiveXObject" in window) {
var xslt = new ActiveXObject("Msxml2.XSLTemplate");
var xmlDoc = new ActiveXObject("Msxml2.DOMDocument");
var xslDoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument");
diff --git a/themes/bootstrap/js/jsTree/jquery.jstree.js b/themes/bootstrap/js/jsTree/jquery.jstree.js
index eec1b7639d3..84155229363 100644
--- a/themes/bootstrap/js/jsTree/jquery.jstree.js
+++ b/themes/bootstrap/js/jsTree/jquery.jstree.js
@@ -3011,7 +3011,7 @@
// Added LOS 03/04/12
$.vakata.xslt = function (xml, xsl, callback) {
var rs = "", xm, xs, processor, support;
- if(window.ActiveXObject) {
+ if(window.ActiveXObject || "ActiveXObject" in window) {
var xslt = new ActiveXObject("Msxml2.XSLTemplate");
var xmlDoc = new ActiveXObject("Msxml2.DOMDocument");
var xslDoc = new ActiveXObject("Msxml2.FreeThreadedDOMDocument");
--
GitLab