Compare commits

..

No commits in common. "9988fcebc1ff7c7afec96d2a66e91458788eff46" and "bf395c16333d2b01138f5a51ed02d8e03b43e303" have entirely different histories.

4 changed files with 7 additions and 14 deletions

View File

@ -4,7 +4,7 @@ OPENSEADRAGON CHANGELOG
3.2.0: (in progress) 3.2.0: (in progress)
* Improved the constraints that keep the image in the viewer, specifically when zoomed out a lot (#2160 @joedf) * Improved the constraints that keep the image in the viewer, specifically when zoomed out a lot (#2160 @joedf)
* You can now provide an element for the navigator (as an alternative to an ID) (#1303 @cameronbaney, #2166 #2175 @joedf) * You can now provide an element for the navigator (as an alternative to an ID); currently only works when you create the navigator yourself (#2166 @cameronbaney @joedf)
3.1.0: 3.1.0:

View File

@ -62,13 +62,13 @@ $.Navigator = function( options ){
if ( options.element ) { if ( options.element ) {
if ( options.id ){ if ( options.id ){
$.console.warn("Given option.id for Navigator was ignored since option.element was provided and is being used instead."); $.console.warn("Given option.id for Navigator was ignored since option.element was provided and is being used instead.");
}
// Don't overwrite the element's id if it has one already
if ( options.element.id ) {
options.id = options.element.id;
} else { } else {
options.id = 'navigator-' + $.now(); // Don't overwrite the element's id if it has one already
if ( options.element.id ) {
options.id = options.element.id;
} else {
options.id = 'navigator-' + $.now();
}
} }
this.element = options.element; this.element = options.element;

View File

@ -410,11 +410,6 @@
* @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 {Element} [navigatorElement=null]
* The element to hold the navigator minimap.
* If an element is specified, the Id option (see navigatorId) is ignored.
* If no element nor ID is specified, a div element will be generated accordingly.
*
* @property {String} [navigatorId=navigator-GENERATED DATE] * @property {String} [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, navigator[Top|Left|Height|Width] and navigatorAutoFade options will be ignored. * If an ID is specified, the navigatorPosition, navigatorSizeRatio, navigatorMaintainSizeRatio, navigator[Top|Left|Height|Width] and navigatorAutoFade options will be ignored.
@ -1270,7 +1265,6 @@ function OpenSeadragon( options ){
//VIEWPORT NAVIGATOR SETTINGS //VIEWPORT NAVIGATOR SETTINGS
showNavigator: false, showNavigator: false,
navigatorElement: null,
navigatorId: null, navigatorId: null,
navigatorPosition: null, navigatorPosition: null,
navigatorSizeRatio: 0.2, navigatorSizeRatio: 0.2,

View File

@ -431,7 +431,6 @@ $.Viewer = function( options ) {
//Instantiate a navigator if configured //Instantiate a navigator if configured
if ( this.showNavigator){ if ( this.showNavigator){
this.navigator = new $.Navigator({ this.navigator = new $.Navigator({
element: this.navigatorElement,
id: this.navigatorId, id: this.navigatorId,
position: this.navigatorPosition, position: this.navigatorPosition,
sizeRatio: this.navigatorSizeRatio, sizeRatio: this.navigatorSizeRatio,