Merge remote-tracking branch 'origin/master' into jsdoc3-documentation

This commit is contained in:
Mark Salsbery 2013-11-18 11:11:24 -08:00
commit e30b0db3aa
2 changed files with 1 additions and 1 deletions

View File

@ -53,6 +53,7 @@ OPENSEADRAGON CHANGELOG
* Viewer.innerTracker.clickHandler: preventDefaultAction == true prevents viewer zoom on click * Viewer.innerTracker.clickHandler: preventDefaultAction == true prevents viewer zoom on click
* Viewer.innerTracker.dragHandler: preventDefaultAction == true prevents viewer panning with mouse/touch * Viewer.innerTracker.dragHandler: preventDefaultAction == true prevents viewer panning with mouse/touch
* Viewer.innerTracker.scrollHandler: preventDefaultAction == true prevents viewer zooming on mousewheel/pinch * Viewer.innerTracker.scrollHandler: preventDefaultAction == true prevents viewer zooming on mousewheel/pinch
* Fixed: IE8 error with custom buttons - "Object doesn't support this action" (#279)
0.9.131: 0.9.131:

View File

@ -112,7 +112,6 @@ $.Button = function( options ) {
}, options ); }, options );
this.element = options.element || $.makeNeutralElement( "button" ); this.element = options.element || $.makeNeutralElement( "button" );
this.element.href = this.element.href || '#';
//if the user has specified the element to bind the control to explicitly //if the user has specified the element to bind the control to explicitly
//then do not add the default control images //then do not add the default control images