mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-29 00:26:10 +03:00
Merge pull request #1950 from rmontroy/ms-IE
Remove support for IE < 11 (#1863)
This commit is contained in:
commit
145d742760
@ -34,7 +34,7 @@ OPENSEADRAGON CHANGELOG
|
|||||||
* MouseTracker: added contextMenuHandler option for handling contextmenu events (#1872 @msalsbery)
|
* MouseTracker: added contextMenuHandler option for handling contextmenu events (#1872 @msalsbery)
|
||||||
* Viewer: added a canvas-contextmenu event (#1872 @msalsbery)
|
* Viewer: added a canvas-contextmenu event (#1872 @msalsbery)
|
||||||
* Added additional documentation for the zoomPerSecond viewer option (#1872 @msalsbery)
|
* Added additional documentation for the zoomPerSecond viewer option (#1872 @msalsbery)
|
||||||
* MouseTracker: Per #1863, dropped support for Internet Explorer < 11 (#1872 @msalsbery)
|
* MouseTracker: Per #1863, dropped support for Internet Explorer < 11 (#1872 @msalsbery) (#1950 @rmontroy)
|
||||||
* Fixed simulated drag events in navigator tests (#1949 @msalsbery)
|
* Fixed simulated drag events in navigator tests (#1949 @msalsbery)
|
||||||
|
|
||||||
2.4.2:
|
2.4.2:
|
||||||
|
@ -2298,40 +2298,8 @@ function OpenSeadragon( options ){
|
|||||||
|
|
||||||
request.onreadystatechange = function(){};
|
request.onreadystatechange = function(){};
|
||||||
|
|
||||||
if (window.XDomainRequest) { // IE9 or IE8 might as well try to use XDomainRequest
|
if ( $.isFunction( onError ) ) {
|
||||||
var xdr = new window.XDomainRequest();
|
onError( request, e );
|
||||||
if (xdr) {
|
|
||||||
xdr.onload = function (e) {
|
|
||||||
if ( $.isFunction( onSuccess ) ) {
|
|
||||||
onSuccess({ // Faking an xhr object
|
|
||||||
responseText: xdr.responseText,
|
|
||||||
status: 200, // XDomainRequest doesn't support status codes, so we just fake one! :/
|
|
||||||
statusText: 'OK'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
xdr.onerror = function (e) {
|
|
||||||
if ($.isFunction(onError)) {
|
|
||||||
onError({ // Faking an xhr object
|
|
||||||
responseText: xdr.responseText,
|
|
||||||
status: 444, // 444 No Response
|
|
||||||
statusText: 'An error happened. Due to an XDomainRequest deficiency we can not extract any information about this error. Upgrade your browser.'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
try {
|
|
||||||
xdr.open('GET', url);
|
|
||||||
xdr.send();
|
|
||||||
} catch (e2) {
|
|
||||||
if ( $.isFunction( onError ) ) {
|
|
||||||
onError( request, e );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if ( $.isFunction( onError ) ) {
|
|
||||||
onError( request, e );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2470,16 +2438,7 @@ function OpenSeadragon( options ){
|
|||||||
* @returns {Object}
|
* @returns {Object}
|
||||||
*/
|
*/
|
||||||
parseJSON: function(string) {
|
parseJSON: function(string) {
|
||||||
if (window.JSON && window.JSON.parse) {
|
$.parseJSON = window.JSON.parse;
|
||||||
$.parseJSON = window.JSON.parse;
|
|
||||||
} else {
|
|
||||||
// Should only be used by IE8 in non standards mode
|
|
||||||
$.parseJSON = function(string) {
|
|
||||||
/*jshint evil:true*/
|
|
||||||
//eslint-disable-next-line no-eval
|
|
||||||
return eval('(' + string + ')');
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return $.parseJSON(string);
|
return $.parseJSON(string);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user