From 3524386543577c323fa83b0a5dd94ec692024fa1 Mon Sep 17 00:00:00 2001 From: Hiroaki ENDOH Date: Fri, 25 Dec 2015 23:33:07 +0900 Subject: [PATCH 1/3] Fix typo --- test/modules/navigator.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/modules/navigator.js b/test/modules/navigator.js index e300b4a0..b6b49e5d 100644 --- a/test/modules/navigator.js +++ b/test/modules/navigator.js @@ -200,28 +200,28 @@ var assessViewerInCorner = function (theContentCorner) { return function () { - var expectedXCoordinate, expecteYCoordinate; + var expectedXCoordinate, expectedYCoordinate; if (theContentCorner === "TOPLEFT") { expectedXCoordinate = 0; - expecteYCoordinate = 0; + expectedYCoordinate = 0; } else if (theContentCorner === "TOPRIGHT") { expectedXCoordinate = 1 - viewer.viewport.getBounds().width; - expecteYCoordinate = 0; + expectedYCoordinate = 0; } else if (theContentCorner === "BOTTOMRIGHT") { expectedXCoordinate = 1 - viewer.viewport.getBounds().width; - expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; + expectedYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; } else if (theContentCorner === "BOTTOMLEFT") { expectedXCoordinate = 0; - expecteYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; + expectedYCoordinate = 1 / viewer.source.aspectRatio - viewer.viewport.getBounds().height; } if (viewer.viewport.getBounds().width < 1) { Util.assessNumericValue(expectedXCoordinate, viewer.viewport.getBounds().x, 0.04, ' Viewer at ' + theContentCorner + ', x coord'); } if (viewer.viewport.getBounds().height < 1 / viewer.source.aspectRatio) { - Util.assessNumericValue(expecteYCoordinate, viewer.viewport.getBounds().y, 0.04, ' Viewer at ' + theContentCorner + ', y coord'); + Util.assessNumericValue(expectedYCoordinate, viewer.viewport.getBounds().y, 0.04, ' Viewer at ' + theContentCorner + ', y coord'); } }; }; From fb222d9fe9b7690ac60c7e1507e3760bce0e301c Mon Sep 17 00:00:00 2001 From: Hiroaki ENDOH Date: Sat, 26 Dec 2015 00:41:40 +0900 Subject: [PATCH 2/3] Fix issue that rectangle can't move to clicked destination on navigator. This issue can reproduce by these steps. 1. Open http://localhost:8000/test/demo/coordinates.html 2. Click Rotate button 3. Click canvas of navigator --- src/navigator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/navigator.js b/src/navigator.js index 2bd80f44..1c49da99 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -372,7 +372,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /* */ function onCanvasClick( event ) { if ( event.quick && this.viewer.viewport ) { - this.viewer.viewport.panTo( this.viewport.pointFromPixel( event.position ).rotate( -this.viewer.viewport.degrees, this.viewer.viewport.getHomeBounds().getCenter() ) ); + this.viewer.viewport.panTo( this.viewport.pointFromPixelNoRotate( event.position ).rotate( -this.viewer.viewport.degrees, this.viewer.viewport.getHomeBounds().getCenter() ) ); this.viewer.viewport.applyConstraints(); } } From 27c91204b63798c19fb675eb4a04f64c98d1086e Mon Sep 17 00:00:00 2001 From: Hiroaki ENDOH Date: Sun, 27 Dec 2015 12:15:17 +0900 Subject: [PATCH 3/3] Refactor to reflect the reviewer comments See also: https://github.com/openseadragon/openseadragon/pull/807#discussion_r48447403 --- src/navigator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/navigator.js b/src/navigator.js index 1c49da99..9fac3637 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -372,7 +372,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /* */ function onCanvasClick( event ) { if ( event.quick && this.viewer.viewport ) { - this.viewer.viewport.panTo( this.viewport.pointFromPixelNoRotate( event.position ).rotate( -this.viewer.viewport.degrees, this.viewer.viewport.getHomeBounds().getCenter() ) ); + this.viewer.viewport.panTo(this.viewport.pointFromPixel(event.position)); this.viewer.viewport.applyConstraints(); } }