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 now

Browse Source
This commit is contained in:
Kevin Ewing 2013-06-19 11:23:42 -07:00
commit ebffea5a34
32 changed files with 981 additions and 980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@ -131,6 +131,7 @@ module.exports = function(grunt) {
browser: true, browser: true,
eqeqeq: false, eqeqeq: false,
loopfunc: false, loopfunc: false,
trailing: true,
globals: { globals: {
OpenSeadragon: true OpenSeadragon: true
} }

2
changelog.txt
View File

@ -3,6 +3,8 @@ OPENSEADRAGON CHANGELOG
0.9.129: (In Progress) 0.9.129: (In Progress)
* Fixed an error when using navPrevNextWrap on single images (#135)
0.9.128: 0.9.128:
* The navigator is now off by default (#102) * The navigator is now off by default (#102)

8
src/viewer.js
View File

@ -346,10 +346,6 @@ $.Viewer = function( options ) {
beginControlsAutoHide( _this ); beginControlsAutoHide( _this );
} ); // initial fade out } ); // initial fade out
if(this.navPrevNextWrap){
this.previousButton.enable();
}
}; };
$.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, { $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, {
@ -855,7 +851,9 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
onBlur: onBlurHandler onBlur: onBlurHandler
}); });
this.previousButton.disable(); if( !this.navPrevNextWrap ){
this.previousButton.disable();
}
if( useGroup ){ if( useGroup ){
this.paging = new $.ButtonGroup({ this.paging = new $.ButtonGroup({