Browse Source

Merge branch 'master' of github.com:NUKnightLab/TimelineJS

pull/710/head
Joe Germuska 10 years ago
parent
commit
39e8ec299d
  1. 13
      source/js/Core/Core/VMM.Library.js

13
source/js/Core/Core/VMM.Library.js

@ -131,22 +131,11 @@ if(typeof VMM != 'undefined') {
}); });
/* CHECK FOR IE /* 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) { if ( VMM.Browser.browser == "Explorer" && parseInt(VMM.Browser.version, 10) >= 7 && window.XDomainRequest) {
trace("IE JSON"); 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);
}
} }
} }

Loading…
Cancel
Save