mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-22 17:53:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #807 from hiroakit/navigator

Browse Source 
Fix issue that rectangle can't move to clicked destination on navigator
This commit is contained in:
Ian Gilman 2016-01-04 09:35:30 -08:00
commit af527e95b8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/navigator.js
View File

@ -372,7 +372,7 @@ $.extend( $.Navigator.prototype, $.EventSource.prototype, $.Viewer.prototype, /*
*/ */
function onCanvasClick( event ) { function onCanvasClick( event ) {
if ( event.quick && this.viewer.viewport ) { 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.pointFromPixel(event.position));
this.viewer.viewport.applyConstraints(); this.viewer.viewport.applyConstraints();
} }
} }

12
test/modules/navigator.js
View File

@ -200,28 +200,28 @@
var assessViewerInCorner = function (theContentCorner) { var assessViewerInCorner = function (theContentCorner) {
return function () { return function () {
var expectedXCoordinate, expecteYCoordinate; var expectedXCoordinate, expectedYCoordinate;
if (theContentCorner === "TOPLEFT") { if (theContentCorner === "TOPLEFT") {
expectedXCoordinate = 0; expectedXCoordinate = 0;
expecteYCoordinate = 0; expectedYCoordinate = 0;
} }
else if (theContentCorner === "TOPRIGHT") { else if (theContentCorner === "TOPRIGHT") {
expectedXCoordinate = 1 - viewer.viewport.getBounds().width; expectedXCoordinate = 1 - viewer.viewport.getBounds().width;
expecteYCoordinate = 0; expectedYCoordinate = 0;
} }
else if (theContentCorner === "BOTTOMRIGHT") { else if (theContentCorner === "BOTTOMRIGHT") {
expectedXCoordinate = 1 - viewer.viewport.getBounds().width; 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") { else if (theContentCorner === "BOTTOMLEFT") {
expectedXCoordinate = 0; 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) { if (viewer.viewport.getBounds().width < 1) {
Util.assessNumericValue(expectedXCoordinate, viewer.viewport.getBounds().x, 0.04, ' Viewer at ' + theContentCorner + ', x coord'); Util.assessNumericValue(expectedXCoordinate, viewer.viewport.getBounds().x, 0.04, ' Viewer at ' + theContentCorner + ', x coord');
} }
if (viewer.viewport.getBounds().height < 1 / viewer.source.aspectRatio) { 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');
} }
}; };
}; };