mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-24 06:06:09 +03:00
Code Issues Projects Releases Wiki Activity

More dropped support for IE11

Browse Source
This commit is contained in:
Mark Salsbery 2024-06-23 16:32:00 -07:00
parent fd74ea3dca
commit 2290e5d08d
9 changed files with 33 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "openseadragon", "name": "openseadragon",
"version": "4.1.0", "version": "4.1.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "openseadragon", "name": "openseadragon",
"version": "4.1.0", "version": "4.1.1",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"devDependencies": { "devDependencies": {
"eslint-plugin-compat": "^4.1.2", "eslint-plugin-compat": "^4.1.2",
@ -656,9 +656,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001456", "version": "1.0.30001636",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001456.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
"integrity": "sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==", "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -668,8 +668,13 @@
{ {
"type": "tidelift", "type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/caniuse-lite" "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
},
{
"type": "github",
"url": "https://github.com/sponsors/ai"
} }
] ],
"license": "CC-BY-4.0"
}, },
"node_modules/chalk": { "node_modules/chalk": {
"version": "2.4.2", "version": "2.4.2",

2
package.json
View File

@ -48,4 +48,4 @@
"test": "grunt test", "test": "grunt test",
"prepare": "grunt build" "prepare": "grunt build"
} }
} }

7
src/button.js
View File

@ -167,13 +167,6 @@ $.Button = function( options ) {
this.imgDown.style.visibility = this.imgDown.style.visibility =
"hidden"; "hidden";
if ($.Browser.vendor === $.BROWSERS.FIREFOX && $.Browser.version < 3) {
this.imgGroup.style.top =
this.imgHover.style.top =
this.imgDown.style.top =
"";
}
this.element.appendChild( this.imgRest ); this.element.appendChild( this.imgRest );
this.element.appendChild( this.imgGroup ); this.element.appendChild( this.imgGroup );
this.element.appendChild( this.imgHover ); this.element.appendChild( this.imgHover );

6
src/control.js
View File

@ -194,11 +194,7 @@ $.Control.prototype = {
* @param {Number} opactiy - a value between 1 and 0 inclusively. * @param {Number} opactiy - a value between 1 and 0 inclusively.
*/ */
setOpacity: function( opacity ) { setOpacity: function( opacity ) {
if ( this.element[ $.SIGNAL ] && $.Browser.vendor === $.BROWSERS.IE ) { $.setElementOpacity( this.wrapper, opacity, true );
$.setElementOpacity( this.element, opacity, true );
} else {
$.setElementOpacity( this.wrapper, opacity, true );
}
} }
}; };

26
src/mousetracker.js
View File

@ -1116,10 +1116,9 @@
/** /**
* Detect available mouse wheel event name. * Detect available mouse wheel event name.
*/ */
$.MouseTracker.wheelEventName = ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version > 8 ) || $.MouseTracker.wheelEventName = ( 'onwheel' in document.createElement( 'div' ) ) ? 'wheel' : // Modern browsers support 'wheel'
( 'onwheel' in document.createElement( 'div' ) ) ? 'wheel' : // Modern browsers support 'wheel' document.onmousewheel !== undefined ? 'mousewheel' : // Webkit (and unsupported IE) support at least 'mousewheel'
document.onmousewheel !== undefined ? 'mousewheel' : // Webkit and IE support at least 'mousewheel' 'DOMMouseScroll'; // Assume old Firefox (deprecated)
'DOMMouseScroll'; // Assume old Firefox
/** /**
* Detect browser pointer device event model(s) and build appropriate list of events to subscribe to. * Detect browser pointer device event model(s) and build appropriate list of events to subscribe to.
@ -1132,7 +1131,7 @@
} }
if ( window.PointerEvent ) { if ( window.PointerEvent ) {
// IE11 and other W3C Pointer Event implementations (see http://www.w3.org/TR/pointerevents) // W3C Pointer Event implementations (see http://www.w3.org/TR/pointerevents)
$.MouseTracker.havePointerEvents = true; $.MouseTracker.havePointerEvents = true;
$.MouseTracker.subscribeEvents.push( "pointerenter", "pointerleave", "pointerover", "pointerout", "pointerdown", "pointerup", "pointermove", "pointercancel" ); $.MouseTracker.subscribeEvents.push( "pointerenter", "pointerleave", "pointerover", "pointerout", "pointerdown", "pointerup", "pointermove", "pointercancel" );
// Pointer events capture support // Pointer events capture support
@ -1671,7 +1670,6 @@
/** /**
* Gets a W3C Pointer Events model compatible pointer type string from a DOM pointer event. * Gets a W3C Pointer Events model compatible pointer type string from a DOM pointer event.
* IE10 used a long integer value, but the W3C specification (and IE11+) use a string "mouse", "touch", "pen", etc.
* *
* Note: Called for both pointer events and legacy mouse events * Note: Called for both pointer events and legacy mouse events
* ($.MouseTracker.havePointerEvents determines which) * ($.MouseTracker.havePointerEvents determines which)
@ -1679,14 +1677,7 @@
* @inner * @inner
*/ */
function getPointerType( event ) { function getPointerType( event ) {
if ( $.MouseTracker.havePointerEvents ) { return $.MouseTracker.havePointerEvents && event.pointerType ? event.pointerType : 'mouse';
// Note: IE pointer events bug - sends invalid pointerType on lostpointercapture events
// and possibly other events. We rely on sane, valid property values in DOM events, so for
// IE, when the pointerType is missing, we'll default to 'mouse'...should be right most of the time
return event.pointerType || (( $.Browser.vendor === $.BROWSERS.IE ) ? 'mouse' : '');
} else {
return 'mouse';
}
} }
@ -2554,15 +2545,14 @@
}; };
// Most browsers implicitly capture touch pointer events // Most browsers implicitly capture touch pointer events
// Note no IE versions have element.hasPointerCapture() so no implicit // Note no IE versions (unsupported) have element.hasPointerCapture() so
// pointer capture possible // no implicit pointer capture possible
// var implicitlyCaptured = ($.MouseTracker.havePointerEvents && // var implicitlyCaptured = ($.MouseTracker.havePointerEvents &&
// event.target.hasPointerCapture && // event.target.hasPointerCapture &&
// $.Browser.vendor !== $.BROWSERS.IE) ? // $.Browser.vendor !== $.BROWSERS.IE) ?
// event.target.hasPointerCapture(event.pointerId) : false; // event.target.hasPointerCapture(event.pointerId) : false;
var implicitlyCaptured = $.MouseTracker.havePointerEvents && var implicitlyCaptured = $.MouseTracker.havePointerEvents &&
gPoint.type === 'touch' && gPoint.type === 'touch';
$.Browser.vendor !== $.BROWSERS.IE;
//$.console.log('pointerdown ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : '')); //$.console.log('pointerdown ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));

1
src/navigator.js
View File

@ -178,7 +178,6 @@ $.Navigator = function( options ){
style['float'] = 'left'; //Webkit style['float'] = 'left'; //Webkit
style.cssFloat = 'left'; //Firefox style.cssFloat = 'left'; //Firefox
style.styleFloat = 'left'; //IE
style.zIndex = 999999999; style.zIndex = 999999999;
style.cursor = 'default'; style.cursor = 'default';
style.boxSizing = 'content-box'; style.boxSizing = 'content-box';

54
src/openseadragon.js
View File

@ -2343,43 +2343,18 @@ function OpenSeadragon( options ){
/** /**
* Create an XHR object * Create an XHR object
* @private * @private
* @param {type} [local] If set to true, the XHR will be file: protocol * @param {type} [local] Deprecated. Ignored (IE/ActiveXObject file protocol no longer supported).
* compatible if possible (but may raise a warning in the browser).
* @returns {XMLHttpRequest} * @returns {XMLHttpRequest}
*/ */
createAjaxRequest: function( local ) { createAjaxRequest: function() {
// IE11 does not support window.ActiveXObject so we just try to if ( window.XMLHttpRequest ) {
// create one to see if it is supported.
// See: http://msdn.microsoft.com/en-us/library/ie/dn423948%28v=vs.85%29.aspx
var supportActiveX;
try {
/* global ActiveXObject:true */
supportActiveX = !!new ActiveXObject( "Microsoft.XMLHTTP" );
} catch( e ) {
supportActiveX = false;
}
if ( supportActiveX ) {
if ( window.XMLHttpRequest ) {
$.createAjaxRequest = function( local ) {
if ( local ) {
return new ActiveXObject( "Microsoft.XMLHTTP" );
}
return new XMLHttpRequest();
};
} else {
$.createAjaxRequest = function() {
return new ActiveXObject( "Microsoft.XMLHTTP" );
};
}
} else if ( window.XMLHttpRequest ) {
$.createAjaxRequest = function() { $.createAjaxRequest = function() {
return new XMLHttpRequest(); return new XMLHttpRequest();
}; };
return new XMLHttpRequest();
} else { } else {
throw new Error( "Browser doesn't support XMLHttpRequest." ); throw new Error( "Browser doesn't support XMLHttpRequest." );
} }
return $.createAjaxRequest( local );
}, },
/** /**
@ -2415,7 +2390,7 @@ function OpenSeadragon( options ){
} }
var protocol = $.getUrlProtocol( url ); var protocol = $.getUrlProtocol( url );
var request = $.createAjaxRequest( protocol === "file:" ); var request = $.createAjaxRequest();
if ( !$.isFunction( onSuccess ) ) { if ( !$.isFunction( onSuccess ) ) {
throw new Error( "makeAjaxRequest requires a success callback" ); throw new Error( "makeAjaxRequest requires a success callback" );
@ -2584,17 +2559,6 @@ function OpenSeadragon( options ){
return xmlDoc; return xmlDoc;
}; };
} else if ( window.ActiveXObject ) {
$.parseXml = function( string ) {
var xmlDoc = null;
xmlDoc = new ActiveXObject( "Microsoft.XMLDOM" );
xmlDoc.async = false;
xmlDoc.loadXML( string );
return xmlDoc;
};
} else { } else {
throw new Error( "Browser doesn't support XML DOM." ); throw new Error( "Browser doesn't support XML DOM." );
} }
@ -2719,6 +2683,10 @@ function OpenSeadragon( options ){
//console.error( 'appVersion: ' + navigator.appVersion ); //console.error( 'appVersion: ' + navigator.appVersion );
//console.error( 'userAgent: ' + navigator.userAgent ); //console.error( 'userAgent: ' + navigator.userAgent );
//TODO navigator.appName is deprecated. Should be 'Netscape' for all browsers
// but could be dropped at any time
// See https://developer.mozilla.org/en-US/docs/Web/API/Navigator/appName
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
switch( navigator.appName ){ switch( navigator.appName ){
case "Microsoft Internet Explorer": case "Microsoft Internet Explorer":
if( !!window.attachEvent && if( !!window.attachEvent &&
@ -2804,8 +2772,8 @@ function OpenSeadragon( options ){
//determine if this browser supports element.style.opacity //determine if this browser supports element.style.opacity
$.Browser.opacity = true; $.Browser.opacity = true;
if ( $.Browser.vendor === $.BROWSERS.IE && $.Browser.version < 11 ) { if ( $.Browser.vendor === $.BROWSERS.IE ) {
$.console.error('Internet Explorer versions < 11 are not supported by OpenSeadragon'); $.console.error('Internet Explorer is not supported by OpenSeadragon');
} }
})(); })();

1
src/referencestrip.js
View File

@ -193,7 +193,6 @@ $.ReferenceStrip = function ( options ) {
element.style.display = 'inline'; element.style.display = 'inline';
element.style['float'] = 'left'; //Webkit element.style['float'] = 'left'; //Webkit
element.style.cssFloat = 'left'; //Firefox element.style.cssFloat = 'left'; //Firefox
element.style.styleFloat = 'left'; //IE
element.style.padding = '2px'; element.style.padding = '2px';
$.setElementTouchActionNone( element ); $.setElementTouchActionNone( element );
$.setElementPointerEventsNone( element ); $.setElementPointerEventsNone( element );

2
test/helpers/legacy.mouse.shim.js
View File

@ -1,4 +1,4 @@
(function($, undefined) { (function($) {
/** /**
* Plugin to force OpenSeadragon to use the legacy mouse pointer event model * Plugin to force OpenSeadragon to use the legacy mouse pointer event model