Merge branch 'master' into raf

This commit is contained in:
Ian Gilman 2013-06-19 10:15:53 -07:00
commit beadcdcc89
2 changed files with 5 additions and 5 deletions

View File

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

View File

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