diff --git a/.eslintrc.json b/.eslintrc.json index 7e027656..35c702a5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -8,10 +8,6 @@ "off", 4 ], - "linebreak-style": [ - "error", - "unix" - ], "quotes": [ "off", "double" diff --git a/changelog.txt b/changelog.txt index 8d2e670c..49253bcf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -52,6 +52,9 @@ OPENSEADRAGON CHANGELOG * Better calculation for TileCache release cutoff (#1214) * Fixed: One image failing to load could cause the others to never load (#1229) * Added functions for dynamically adding and removing the reference strip in sequence mode (#1213) +* Added ability to provide thumbnail URLs for reference strip (#1241) +* Fixed: Mouse up outside map will cause "canvas-drag" event to stick (#1133) +* Improved panning constraints for constrainDuringPan (#1133) 2.2.1: diff --git a/src/mousetracker.js b/src/mousetracker.js index d81f5561..aa5eb35f 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -862,6 +862,21 @@ blurHandler: function () { } }; + /** + * Resets all active mousetrakers. (Added to patch issue #697 "Mouse up outside map will cause "canvas-drag" event to stick") + * + * @private + * @member resetAllMouseTrackers + * @memberof OpenSeadragon.MouseTracker + */ + $.MouseTracker.resetAllMouseTrackers = function(){ + for(var i = 0; i < MOUSETRACKERS.length; i++){ + if (MOUSETRACKERS[i].isTracking()){ + MOUSETRACKERS[i].setTracking(false); + MOUSETRACKERS[i].setTracking(true); + } + } + }; /** * Provides continuous computation of velocity (speed and direction) of active pointers. diff --git a/src/referencestrip.js b/src/referencestrip.js index 69fa8e29..e1074572 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -428,9 +428,19 @@ function loadPanels( strip, viewerSize, scroll ) { for ( i = activePanelsStart; i < activePanelsEnd && i < strip.panels.length; i++ ) { element = strip.panels[i]; if ( !element.activePanel ) { + var miniTileSource; + var originalTileSource = strip.viewer.tileSources[i]; + if (originalTileSource.referenceStripThumbnailUrl) { + miniTileSource = { + type: 'image', + url: originalTileSource.referenceStripThumbnailUrl + }; + } else { + miniTileSource = originalTileSource; + } miniViewer = new $.Viewer( { id: element.id, - tileSources: [strip.viewer.tileSources[i]], + tileSources: [miniTileSource], element: element, navigatorSizeRatio: strip.sizeRatio, showNavigator: false, diff --git a/src/tilesource.js b/src/tilesource.js index e83c4fab..b40598ae 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -60,6 +60,8 @@ * the extending classes implementation of 'configure'. * @param {String} [options.url] * The URL for the data necessary for this TileSource. + * @param {String} [options.referenceStripThumbnailUrl] + * The URL for a thumbnail image to be used by the reference strip * @param {Function} [options.success] * A function to be called upon successful creation. * @param {Boolean} [options.ajaxWithCredentials] diff --git a/src/viewer.js b/src/viewer.js index 10e6e4a4..936e4eaf 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -2639,6 +2639,7 @@ function onCanvasDblClick( event ) { function onCanvasDrag( event ) { var gestureSettings; + var canvasDragEventArgs = { tracker: event.eventSource, position: event.position, @@ -2667,7 +2668,8 @@ function onCanvasDrag( event ) { * @property {?Object} userData - Arbitrary subscriber-defined object. */ this.raiseEvent( 'canvas-drag', canvasDragEventArgs); - if ( !canvasDragEventArgs.preventDefaultAction && this.viewport ) { + + if ( !event.preventDefaultAction && this.viewport ) { gestureSettings = this.gestureSettingsByDeviceType( event.pointerType ); if( !this.panHorizontal ){ event.delta.x = 0; @@ -2675,12 +2677,29 @@ function onCanvasDrag( event ) { if( !this.panVertical ){ event.delta.y = 0; } - if( event.delta.x !== 0 || event.delta.y !== 0 ){ - this.viewport.panBy( this.viewport.deltaPointsFromPixels( event.delta.negate() ), gestureSettings.flickEnabled ); - if( this.constrainDuringPan ){ - this.viewport.applyConstraints(); + + if( this.constrainDuringPan ){ + var delta = this.viewport.deltaPointsFromPixels( event.delta.negate() ); + + this.viewport.centerSpringX.target.value += delta.x; + this.viewport.centerSpringY.target.value += delta.y; + + var bounds = this.viewport.getBounds(); + var constrainedBounds = this.viewport.getConstrainedBounds(); + + this.viewport.centerSpringX.target.value -= delta.x; + this.viewport.centerSpringY.target.value -= delta.y; + + if (bounds.x != constrainedBounds.x) { + event.delta.x = 0; + } + + if (bounds.y != constrainedBounds.y) { + event.delta.y = 0; } } + + this.viewport.panBy( this.viewport.deltaPointsFromPixels( event.delta.negate() ), gestureSettings.flickEnabled ); } } @@ -2763,6 +2782,11 @@ function onCanvasEnter( event ) { } function onCanvasExit( event ) { + + if (window.location != window.parent.location){ + $.MouseTracker.resetAllMouseTrackers(); + } + /** * Raised when a pointer leaves the {@link OpenSeadragon.Viewer#canvas} element. * diff --git a/src/viewport.js b/src/viewport.js index 55851dc4..6a23b85f 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -733,6 +733,24 @@ $.Viewport.prototype = { }, + /** + * Returns bounds taking constraints into account + * Added to improve constrained panning + * @param {Boolean} immediately + * @return {OpenSeadragon.Viewport} Chainable. + */ + // Added to improve constrained panning + getConstrainedBounds: function( immediately ) { + var bounds, + constrainedBounds; + + bounds = this.getBounds(); + + constrainedBounds = this._applyBoundaryConstraints( bounds, immediately ); + + return constrainedBounds; + }, + /** * @function * @param {OpenSeadragon.Point} delta diff --git a/test/demo/constrainedpan.html b/test/demo/constrainedpan.html new file mode 100644 index 00000000..1cd7578a --- /dev/null +++ b/test/demo/constrainedpan.html @@ -0,0 +1,48 @@ + + + + OpenSeadragon fitBoundsWithConstraints() Demo + + + + +
+

Simple demo to see panning improvements using the following settings:

+ +
+ +
+ + + + \ No newline at end of file diff --git a/test/demo/iframe-embed.html b/test/demo/iframe-embed.html new file mode 100644 index 00000000..33a34b45 --- /dev/null +++ b/test/demo/iframe-embed.html @@ -0,0 +1,32 @@ + + + + Iframe example embed + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/test/demo/iframe-host.html b/test/demo/iframe-host.html new file mode 100644 index 00000000..ea602473 --- /dev/null +++ b/test/demo/iframe-host.html @@ -0,0 +1,18 @@ + + + + Iframe example + + + + + + + + + + + + \ No newline at end of file