mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-19 17:21:50 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Fixed navigator resize"

Browse Source 
- This reverts commit c8254383394c5e824ebaadabffa849fb5ad3feae.
- Made navigator always use a minZoomImageRatio of 1
This commit is contained in:
Shaun Whitely 2015-09-03 09:13:10 +10:00
parent c825438339
commit 59a6a43379
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/navigator.js
View File

@ -108,7 +108,9 @@ $.Navigator = function( options ){
immediateRender: true, immediateRender: true,
blendTime: 0, blendTime: 0,
animationTime: 0, animationTime: 0,
autoResize: options.autoResize autoResize: options.autoResize,
// prevent resizing the navigator from adding unwanted space around the image
minZoomImageRatio: 1.0
}); });
options.minPixelRatio = this.minPixelRatio = viewer.minPixelRatio; options.minPixelRatio = this.minPixelRatio = viewer.minPixelRatio;

11
src/openseadragon.js
View File

@ -241,7 +241,7 @@
* @property {Number} [minZoomImageRatio=0.9] * @property {Number} [minZoomImageRatio=0.9]
* The minimum percentage ( expressed as a number between 0 and 1 ) of * The minimum percentage ( expressed as a number between 0 and 1 ) of
* the viewport height or width at which the zoom out will be constrained. * the viewport height or width at which the zoom out will be constrained.
* Setting it to 0, for example will allow you to zoom out infinitely. * Setting it to 0, for example will allow you to zoom out infinitly.
* *
* @property {Number} [maxZoomPixelRatio=1.1] * @property {Number} [maxZoomPixelRatio=1.1]
* The maximum ratio to allow a zoom-in to affect the highest level pixel * The maximum ratio to allow a zoom-in to affect the highest level pixel
@ -356,7 +356,7 @@
* @property {Boolean} [showNavigator=false] * @property {Boolean} [showNavigator=false]
* Set to true to make the navigator minimap appear. * Set to true to make the navigator minimap appear.
* *
* @property {String} [navigatorId=navigator-GENERATED DATE] * @property {Boolean} [navigatorId=navigator-GENERATED DATE]
* The ID of a div to hold the navigator minimap. * The ID of a div to hold the navigator minimap.
* If an ID is specified, the navigatorPosition, navigatorSizeRatio, navigatorMaintainSizeRatio, and navigatorTop|Left|Height|Width options will be ignored. * If an ID is specified, the navigatorPosition, navigatorSizeRatio, navigatorMaintainSizeRatio, and navigatorTop|Left|Height|Width options will be ignored.
* If an ID is not specified, a div element will be generated and placed on top of the main image. * If an ID is not specified, a div element will be generated and placed on top of the main image.
@ -393,12 +393,6 @@
* @property {Boolean} [navigatorRotate=true] * @property {Boolean} [navigatorRotate=true]
* If true, the navigator will be rotated together with the viewer. * If true, the navigator will be rotated together with the viewer.
* *
* @property {Number} [navigatorMinZoomImageRatio=1.0]
* The minimum percentage ( expressed as a number between 0 and 1 ) of
* the navigator's image height or width at which the zoom out will be
* constrained during resize. Setting it to 0, for example will allow you
* to zoom out infinitely. Only applies when navigatorId is specified.
*
* @property {Number} [controlsFadeDelay=2000] * @property {Number} [controlsFadeDelay=2000]
* The number of milliseconds to wait once the user has stopped interacting * The number of milliseconds to wait once the user has stopped interacting
* with the interface before begining to fade the controls. Assumes * with the interface before begining to fade the controls. Assumes
@ -1030,7 +1024,6 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){
navigatorWidth: null, navigatorWidth: null,
navigatorAutoResize: true, navigatorAutoResize: true,
navigatorRotate: true, navigatorRotate: true,
navigatorMinZoomImageRatio: 1.0,
// INITIAL ROTATION // INITIAL ROTATION
degrees: 0, degrees: 0,

3
src/viewer.js
View File

@ -411,8 +411,7 @@ $.Viewer = function( options ) {
prefixUrl: this.prefixUrl, prefixUrl: this.prefixUrl,
viewer: this, viewer: this,
navigatorRotate: this.navigatorRotate, navigatorRotate: this.navigatorRotate,
crossOriginPolicy: this.crossOriginPolicy, crossOriginPolicy: this.crossOriginPolicy
minZoomImageRatio: this.navigatorMinZoomImageRatio
}); });
} }