From 6bde88dc92a2652b5c2010a11aabaefc34305b38 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Mon, 13 Oct 2014 11:06:50 -0400 Subject: [PATCH] Remove HTTPS URL rewriting for older IE. This code was breaking loading data over HTTPS in IE9/10. Issue noticed loading data from Google Doc URL with Timeline.js under HTTPS. --- source/js/Core/Core/VMM.Library.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/source/js/Core/Core/VMM.Library.js b/source/js/Core/Core/VMM.Library.js index 0b4935a..a9ffce3 100644 --- a/source/js/Core/Core/VMM.Library.js +++ b/source/js/Core/Core/VMM.Library.js @@ -131,22 +131,11 @@ if(typeof VMM != 'undefined') { }); /* CHECK FOR IE ================================================== */ + // Leaving for posterity - removed previous HTTPS url rewriting that was breaking IE9/10 loading data over HTTPS if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) { trace("IE JSON"); - var ie_url = url; - if (ie_url.match('^http://')){ - return jQuery.getJSON(ie_url, data, callback); - } else if (ie_url.match('^https://')) { - ie_url = ie_url.replace("https://","http://"); - return jQuery.getJSON(ie_url, data, callback); - } else { - return jQuery.getJSON(url, data, callback); - } - - } else { - return jQuery.getJSON(url, data, callback); - } + return jQuery.getJSON(url, data, callback); } }