Merge branch 'master' into custom_zoom_handler

This commit is contained in:
Luke Murray 2013-07-31 16:39:54 +10:00
commit 0a8d11875e
2 changed files with 3 additions and 1 deletions

View File

@ -4,6 +4,7 @@ OPENSEADRAGON CHANGELOG
0.9.130: (In progress)
* OpenSeadragon.now() returned undefined the first time; fixed
* onTouchEnd did not call the correct mouse up handler; fixed (#159)
0.9.129:

View File

@ -789,7 +789,8 @@
event.changedTouches.length == 1 ){
THIS[ tracker.hash ].lastTouch = null;
onMouseUp( tracker, event.changedTouches[ 0 ] );
onMouseUpWindow( tracker, event.changedTouches[ 0 ] );
onMouseOut( tracker, event.changedTouches[ 0 ] );
}
if( event.touches.length + event.changedTouches.length == 2 ){