mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-01 07:31:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into form

Browse Source
This commit is contained in:
Ian Gilman 2013-08-14 10:41:32 -07:00
commit adbf35e002
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -3,6 +3,7 @@ OPENSEADRAGON CHANGELOG
0.9.130: (In progress) 0.9.130: (In progress)
* Fixed: navigatorPosition option corrected. (#163)
* OpenSeadragon.now() returned undefined the first time; fixed * OpenSeadragon.now() returned undefined the first time; fixed
* onTouchEnd did not call the correct mouse up handler; fixed (#159) * onTouchEnd did not call the correct mouse up handler; fixed (#159)
* Touch events no longer capture mouse (was causing issues on devices that support both) (#168) * Touch events no longer capture mouse (was causing issues on devices that support both) (#168)

26
src/navigator.js
View File

@ -58,15 +58,31 @@ $.Navigator = function( options ){
if( !options.id ){ if( !options.id ){
options.id = 'navigator-' + $.now(); options.id = 'navigator-' + $.now();
this.element = $.makeNeutralElement( "div" ); this.element = $.makeNeutralElement( "div" );
options.controlOptions = {anchor: $.ControlAnchor.TOP_RIGHT, options.controlOptions = {
anchor: $.ControlAnchor.TOP_RIGHT,
attachToViewer: true, attachToViewer: true,
autoFade: true}; autoFade: true
};
if( options.position ){
if( 'BOTTOM_RIGHT' == options.position ){
options.controlOptions.anchor = $.ControlAnchor.BOTTOM_RIGHT;
} else if( 'BOTTOM_LEFT' == options.position ){
options.controlOptions.anchor = $.ControlAnchor.BOTTOM_LEFT;
} else if( 'TOP_RIGHT' == options.position ){
options.controlOptions.anchor = $.ControlAnchor.TOP_RIGHT;
} else if( 'TOP_LEFT' == options.position ){
options.controlOptions.anchor = $.ControlAnchor.TOP_LEFT;
} }
else { }
} else {
this.element = document.getElementById( options.id ); this.element = document.getElementById( options.id );
options.controlOptions = {anchor: $.ControlAnchor.NONE, options.controlOptions = {
anchor: $.ControlAnchor.NONE,
attachToViewer: false, attachToViewer: false,
autoFade: false}; autoFade: false
};
} }
this.element.id = options.id; this.element.id = options.id;
this.element.className += ' navigator'; this.element.className += ' navigator';