mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-22 13:16:10 +03:00
Merge branch 'collections' into bugs
This commit is contained in:
Ian Gilman
commit
68dfc79101
@ -46,7 +46,7 @@ module.exports = function(grunt) {
|
||||
"src/referencestrip.js",
|
||||
"src/displayrectangle.js",
|
||||
"src/spring.js",
|
||||
"src/imageLoader.js",
|
||||
"src/imageloader.js",
|
||||
"src/tile.js",
|
||||
"src/overlay.js",
|
||||
"src/drawer.js",
|
||||
|
||||
@ -56,8 +56,8 @@ OPENSEADRAGON CHANGELOG
|
||||
* Viewport.setRotation now allows all rotation angles (#466)
|
||||
* Pinch rotate is now available (defaults to off) (#468)
|
||||
* Added option for home button to fill viewer (#474)
|
||||
* Now handling iframe/frame mouseouts properly (#481)
|
||||
* Better handling of mid-update image loaded callbacks (#409)
|
||||
* Tracked pointers are now cleaned up when Viewer.setMouseNavEnabled(false) is called (#518)
|
||||
|
||||
1.1.1:
|
||||
|
||||
|
||||
@ -94,14 +94,16 @@ ImageJob.prototype = {
|
||||
* @memberof OpenSeadragon
|
||||
* @classdesc Handles downloading of a set of images using asynchronous queue pattern.
|
||||
* You generally won't have to interact with the ImageLoader directly.
|
||||
* @param {Object} options - Options for this ImageLoader.
|
||||
* @param {Number} [options.jobLimit] - The number of concurrent image requests. See imageLoaderLimit in {@link OpenSeadragon.Options} for details.
|
||||
*/
|
||||
$.ImageLoader = function() {
|
||||
$.ImageLoader = function( options ) {
|
||||
|
||||
$.extend( true, this, {
|
||||
jobLimit: $.DEFAULT_SETTINGS.imageLoaderLimit,
|
||||
jobQueue: [],
|
||||
jobsInProgress: 0
|
||||
});
|
||||
}, options );
|
||||
|
||||
};
|
||||
|
||||
@ -160,10 +162,10 @@ function completeJob( loader, job, callback ) {
|
||||
if ( (!loader.jobLimit || loader.jobsInProgress < loader.jobLimit) && loader.jobQueue.length > 0) {
|
||||
nextJob = loader.jobQueue.shift();
|
||||
nextJob.start();
|
||||
loader.jobsInProgress++;
|
||||
}
|
||||
|
||||
callback( job.image );
|
||||
}
|
||||
|
||||
}( OpenSeadragon ));
|
||||
|
||||
@ -193,8 +193,6 @@
|
||||
mousemove: function ( event ) { onMouseMove( _this, event ); },
|
||||
mousemovecaptured: function ( event ) { onMouseMoveCaptured( _this, event ); },
|
||||
|
||||
mouseoutdocument: function ( event ) { onMouseOutDocument( _this, event ); },
|
||||
|
||||
touchenter: function ( event ) { onTouchEnter( _this, event ); },
|
||||
touchleave: function ( event ) { onTouchLeave( _this, event ); },
|
||||
touchstart: function ( event ) { onTouchStart( _this, event ); },
|
||||
@ -210,9 +208,6 @@
|
||||
pointerout: function ( event ) { onPointerOut( _this, event ); },
|
||||
MSPointerOut: function ( event ) { onPointerOut( _this, event ); },
|
||||
|
||||
pointeroutdocument: function ( event ) { onPointerOutDocument( _this, event ); },
|
||||
MSPointerOutdocument: function ( event ) { onPointerOutDocument( _this, event ); },
|
||||
|
||||
pointerdown: function ( event ) { onPointerDown( _this, event ); },
|
||||
MSPointerDown: function ( event ) { onPointerDown( _this, event ); },
|
||||
pointerup: function ( event ) { onPointerUp( _this, event ); },
|
||||
@ -797,6 +792,8 @@
|
||||
// Pointer event model and feature detection
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
$.MouseTracker.captureElement = document;
|
||||
|
||||
/**
|
||||
* Detect available mouse wheel event name.
|
||||
*/
|
||||
@ -1035,6 +1032,50 @@
|
||||
// Utility functions
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/**
|
||||
* Removes all tracked pointers.
|
||||
* @private
|
||||
* @inner
|
||||
*/
|
||||
function clearTrackedPointers( tracker ) {
|
||||
var delegate = THIS[ tracker.hash ],
|
||||
i,
|
||||
pointerListCount = delegate.activePointersLists.length;
|
||||
|
||||
if ( delegate.pointerCaptureCount > 0 ) {
|
||||
$.removeEvent(
|
||||
$.MouseTracker.captureElement,
|
||||
'mousemove',
|
||||
delegate.mousemovecaptured,
|
||||
true
|
||||
);
|
||||
$.removeEvent(
|
||||
$.MouseTracker.captureElement,
|
||||
'mouseup',
|
||||
delegate.mouseupcaptured,
|
||||
true
|
||||
);
|
||||
$.removeEvent(
|
||||
$.MouseTracker.captureElement,
|
||||
$.MouseTracker.unprefixedPointerEvents ? 'pointermove' : 'MSPointerMove',
|
||||
delegate.pointermovecaptured,
|
||||
true
|
||||
);
|
||||
$.removeEvent(
|
||||
$.MouseTracker.captureElement,
|
||||
$.MouseTracker.unprefixedPointerEvents ? 'pointerup' : 'MSPointerUp',
|
||||
delegate.pointerupcaptured,
|
||||
true
|
||||
);
|
||||
|
||||
delegate.pointerCaptureCount = 0;
|
||||
}
|
||||
|
||||
for ( i = 0; i < pointerListCount; i++ ) {
|
||||
delegate.activePointersLists.pop();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts tracking pointer events on the tracked element.
|
||||
* @private
|
||||
@ -1056,14 +1097,7 @@
|
||||
);
|
||||
}
|
||||
|
||||
// handle pointer/mouse out of document body
|
||||
if ( window.PointerEvent ) {
|
||||
$.addEvent(document.body, "pointerout", delegate.pointeroutdocument);
|
||||
} else if ( window.MSPointerEvent ) {
|
||||
$.addEvent(document.body, "pointerout", delegate.MSPointerOutdocument);
|
||||
} else {
|
||||
$.addEvent(document.body, "mouseout", delegate.mouseoutdocument);
|
||||
}
|
||||
clearTrackedPointers( tracker );
|
||||
|
||||
delegate.tracking = true;
|
||||
}
|
||||
@ -1090,14 +1124,7 @@
|
||||
);
|
||||
}
|
||||
|
||||
// handle pointer/mouse out of document body
|
||||
if ( window.PointerEvent ) {
|
||||
$.removeEvent(document.body, "pointerout", delegate.pointeroutdocument);
|
||||
} else if ( window.MSPointerEvent ) {
|
||||
$.removeEvent(document.body, "MSPointerOut", delegate.MSPointerOutdocument);
|
||||
} else {
|
||||
$.removeEvent(document.body, "mouseout", delegate.mouseoutdocument);
|
||||
}
|
||||
clearTrackedPointers( tracker );
|
||||
|
||||
delegate.tracking = false;
|
||||
}
|
||||
@ -1112,19 +1139,18 @@
|
||||
var delegate = THIS[ tracker.hash ];
|
||||
|
||||
delegate.pointerCaptureCount++;
|
||||
//$.console.log('pointerCaptureCount++ ', delegate.pointerCaptureCount);
|
||||
|
||||
if ( delegate.pointerCaptureCount === 1 ) {
|
||||
// We emulate mouse capture by hanging listeners on the window object.
|
||||
// (Note we listen on the capture phase so the captured handlers will get called first)
|
||||
$.addEvent(
|
||||
window,
|
||||
$.MouseTracker.captureElement,
|
||||
isLegacyMouse ? 'mouseup' : ($.MouseTracker.unprefixedPointerEvents ? 'pointerup' : 'MSPointerUp'),
|
||||
isLegacyMouse ? delegate.mouseupcaptured : delegate.pointerupcaptured,
|
||||
true
|
||||
);
|
||||
$.addEvent(
|
||||
window,
|
||||
$.MouseTracker.captureElement,
|
||||
isLegacyMouse ? 'mousemove' : ($.MouseTracker.unprefixedPointerEvents ? 'pointermove' : 'MSPointerMove'),
|
||||
isLegacyMouse ? delegate.mousemovecaptured : delegate.pointermovecaptured,
|
||||
true
|
||||
@ -1142,19 +1168,18 @@
|
||||
var delegate = THIS[ tracker.hash ];
|
||||
|
||||
delegate.pointerCaptureCount--;
|
||||
//$.console.log('pointerCaptureCount-- ', delegate.pointerCaptureCount);
|
||||
|
||||
if ( delegate.pointerCaptureCount === 0 ) {
|
||||
// We emulate mouse capture by hanging listeners on the window object.
|
||||
// (Note we listen on the capture phase so the captured handlers will get called first)
|
||||
$.removeEvent(
|
||||
window,
|
||||
$.MouseTracker.captureElement,
|
||||
isLegacyMouse ? 'mousemove' : ($.MouseTracker.unprefixedPointerEvents ? 'pointermove' : 'MSPointerMove'),
|
||||
isLegacyMouse ? delegate.mousemovecaptured : delegate.pointermovecaptured,
|
||||
true
|
||||
);
|
||||
$.removeEvent(
|
||||
window,
|
||||
$.MouseTracker.captureElement,
|
||||
isLegacyMouse ? 'mouseup' : ($.MouseTracker.unprefixedPointerEvents ? 'pointerup' : 'MSPointerUp'),
|
||||
isLegacyMouse ? delegate.mouseupcaptured : delegate.pointerupcaptured,
|
||||
true
|
||||
@ -1481,35 +1506,6 @@
|
||||
updatePointersExit( tracker, event, [ gPoint ] );
|
||||
}
|
||||
|
||||
/**
|
||||
* This handler is used to handle the case where the mouse is dragged out of the window, it should cause the drag to be properly released.
|
||||
*
|
||||
* @private
|
||||
* @inner
|
||||
*/
|
||||
function onMouseOutDocument( tracker, event ) {
|
||||
event = $.getEvent( event );
|
||||
|
||||
var html = document.getElementsByTagName("html")[0];
|
||||
var target = event.target || event.srcElement;
|
||||
if ((event.relatedTarget!==html && event.relatedTarget!==null) || event.currentTarget !== document.body) {
|
||||
return; // not a mouseout of the iframe
|
||||
}
|
||||
|
||||
var gPoint = {
|
||||
id: $.MouseTracker.mousePointerId,
|
||||
type: 'mouse',
|
||||
isPrimary: true,
|
||||
currentPos: getMouseAbsolute( event ),
|
||||
currentTime: $.now()
|
||||
};
|
||||
|
||||
event.buttons = undefined;
|
||||
|
||||
if ( updatePointersUp( tracker, event, [ gPoint ], 0 ) ) {
|
||||
releasePointer( tracker, true );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
@ -1700,6 +1696,7 @@
|
||||
|
||||
if ( updatePointersDown( tracker, event, gPoints, 0 ) ) { // 0 means primary button press/release or touch contact
|
||||
// Touch event model start, end, and move events are always captured so we don't need to capture explicitly
|
||||
$.stopEvent( event );
|
||||
}
|
||||
|
||||
$.cancelEvent( event );
|
||||
@ -1853,33 +1850,6 @@
|
||||
updatePointersExit( tracker, event, [ gPoint ] );
|
||||
}
|
||||
|
||||
/**
|
||||
* This handler is used to handle the case where the pointer is dragged out of the window, it should cause the drag to be properly released.
|
||||
*
|
||||
* @private
|
||||
* @inner
|
||||
*/
|
||||
function onPointerOutDocument( tracker, event ) {
|
||||
event = $.getEvent( event );
|
||||
|
||||
var html = document.getElementsByTagName("html")[0];
|
||||
if ((event.relatedTarget!==html && event.relatedTarget!==null) || event.currentTarget !== document.body) {
|
||||
return; // not a mouseout of the iframe
|
||||
}
|
||||
|
||||
var gPoint = {
|
||||
id: event.pointerId,
|
||||
type: getPointerType( event ),
|
||||
isPrimary: event.isPrimary,
|
||||
currentPos: getMouseAbsolute( event ),
|
||||
currentTime: $.now()
|
||||
};
|
||||
|
||||
if ( updatePointersUp( tracker, event, [ gPoint ], 0 ) ) {
|
||||
releasePointer( tracker, false );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @inner
|
||||
|
||||
@ -436,7 +436,9 @@ $.Viewer = function( options ) {
|
||||
this.viewport.setHomeBounds(this.world.getHomeBounds(), this.world.getContentFactor());
|
||||
|
||||
// Create the image loader
|
||||
this.imageLoader = new $.ImageLoader();
|
||||
this.imageLoader = new $.ImageLoader({
|
||||
jobLimit: this.imageLoaderLimit
|
||||
});
|
||||
|
||||
// Create the tile cache
|
||||
this.tileCache = new $.TileCache({
|
||||
|
||||
@ -165,13 +165,13 @@
|
||||
var simulateLeave = function (x, y) {
|
||||
simEvent.clientX = offset.left + x;
|
||||
simEvent.clientY = offset.top + y;
|
||||
simEvent.relatedTarget = document.body;
|
||||
$canvas.simulate( OpenSeadragon.MouseTracker.haveMouseEnter ? 'mouseleave' : 'mouseout', simEvent );
|
||||
};
|
||||
var simulateLeaveFrame = function (x, y) {
|
||||
simEvent.clientX = offset.left + x;
|
||||
simEvent.clientY = offset.top + y;
|
||||
simEvent.relatedTarget = document.getElementsByTagName("html")[0];
|
||||
// simEvent.relatedTarget = document.body;
|
||||
// $canvas.simulate( OpenSeadragon.MouseTracker.haveMouseEnter ? 'mouseleave' : 'mouseout', simEvent );
|
||||
//};
|
||||
//var simulateLeaveFrame = function (x, y) {
|
||||
// simEvent.clientX = offset.left + x;
|
||||
// simEvent.clientY = offset.top + y;
|
||||
// simEvent.relatedTarget = document.getElementsByTagName("html")[0];
|
||||
$canvas.simulate( OpenSeadragon.MouseTracker.haveMouseEnter ? 'mouseleave' : 'mouseout', simEvent );
|
||||
};
|
||||
|
||||
@ -454,31 +454,31 @@
|
||||
});
|
||||
|
||||
|
||||
// enter-press-move-exit-move-release-outside (drag, release outside iframe)
|
||||
resetForAssessment();
|
||||
simulateEnter(0, 0);
|
||||
simulateDown(0, 0);
|
||||
simulateMove(1, 1, 5);
|
||||
simulateMove(-1, -1, 5);
|
||||
simulateLeaveFrame(-1, -1);
|
||||
// you don't actually receive the mouseup if you mouseup outside of the document
|
||||
assessGestureExpectations({
|
||||
description: 'enter-press-move-exit-move-release-outside (drag, release outside iframe): ',
|
||||
enterCount: 1,
|
||||
exitCount: 1,
|
||||
pressCount: 1,
|
||||
releaseCount: 1,
|
||||
moveCount: 10,
|
||||
clickCount: 0,
|
||||
dblClickCount: 0,
|
||||
dragCount: 10,
|
||||
dragEndCount: 1,
|
||||
insideElementPressed: true,
|
||||
insideElementReleased: false,
|
||||
contacts: 0,
|
||||
trackedPointers: 0,
|
||||
quickClick: false
|
||||
});
|
||||
//// enter-press-move-exit-move-release-outside (drag, release outside iframe)
|
||||
//resetForAssessment();
|
||||
//simulateEnter(0, 0);
|
||||
//simulateDown(0, 0);
|
||||
//simulateMove(1, 1, 5);
|
||||
//simulateMove(-1, -1, 5);
|
||||
//simulateLeaveFrame(-1, -1);
|
||||
//// you don't actually receive the mouseup if you mouseup outside of the document
|
||||
//assessGestureExpectations({
|
||||
// description: 'enter-press-move-exit-move-release-outside (drag, release outside iframe): ',
|
||||
// enterCount: 1,
|
||||
// exitCount: 1,
|
||||
// pressCount: 1,
|
||||
// releaseCount: 1,
|
||||
// moveCount: 10,
|
||||
// clickCount: 0,
|
||||
// dblClickCount: 0,
|
||||
// dragCount: 10,
|
||||
// dragEndCount: 1,
|
||||
// insideElementPressed: true,
|
||||
// insideElementReleased: false,
|
||||
// contacts: 0,
|
||||
// trackedPointers: 0,
|
||||
// quickClick: false
|
||||
//});
|
||||
unhookViewerHandlers();
|
||||
|
||||
viewer.close();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user