mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 06:36:11 +03:00
Code Issues Projects Releases Wiki Activity

IE 11 fix and Merge branch 'master' into mousetracker_MSPointerEvent

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
Mark Salsbery 2015-01-20 13:28:30 -08:00
commit 912f82d36d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -20,7 +20,8 @@ OPENSEADRAGON CHANGELOG
* Requesting keyboard focus when viewer is clicked (#537) * Requesting keyboard focus when viewer is clicked (#537)
* Arrow key navigation fixed across platforms (#565) * Arrow key navigation fixed across platforms (#565)
* Removed textarea element from viewer DOM. Viewer.canvas now handles keyboard navigation (#569) * Removed textarea element from viewer DOM. Viewer.canvas now handles keyboard navigation (#569)
* Fixed pointer event model detection for IE 10 (#571) * Removed 'position' property from MouseTracker keyDownHandler/keyUpHandler/keyHandler functions (#573)
* Fixed pointer event model detection for IE 10 and IE 11 (#571)
1.2.0: 1.2.0:

6
src/mousetracker.js
View File

@ -977,7 +977,8 @@
$.MouseTracker.subscribeEvents.push( "MozMousePixelScroll" ); $.MouseTracker.subscribeEvents.push( "MozMousePixelScroll" );
} }
if ( window.PointerEvent ) { // Note: window.navigator.pointerEnable is deprecated on IE 11 and not part of W3C spec.
if ( window.PointerEvent && ( window.navigator.pointerEnabled || $.Browser.vendor !== $.BROWSERS.IE ) ) {
// IE11 and other W3C Pointer Event implementations (see http://www.w3.org/TR/pointerevents) // IE11 and other W3C Pointer Event implementations (see http://www.w3.org/TR/pointerevents)
$.MouseTracker.havePointerEvents = true; $.MouseTracker.havePointerEvents = true;
$.MouseTracker.subscribeEvents.push( "pointerover", "pointerout", "pointerdown", "pointerup", "pointermove", "pointercancel" ); $.MouseTracker.subscribeEvents.push( "pointerover", "pointerout", "pointerdown", "pointerup", "pointermove", "pointercancel" );
@ -1518,7 +1519,6 @@
propagate = tracker.keyDownHandler( propagate = tracker.keyDownHandler(
{ {
eventSource: tracker, eventSource: tracker,
position: getMouseRelative( event, tracker.element ),
keyCode: event.keyCode ? event.keyCode : event.charCode, keyCode: event.keyCode ? event.keyCode : event.charCode,
ctrl: event.ctrlKey, ctrl: event.ctrlKey,
shift: event.shiftKey, shift: event.shiftKey,
@ -1548,7 +1548,6 @@
propagate = tracker.keyUpHandler( propagate = tracker.keyUpHandler(
{ {
eventSource: tracker, eventSource: tracker,
position: getMouseRelative( event, tracker.element ),
keyCode: event.keyCode ? event.keyCode : event.charCode, keyCode: event.keyCode ? event.keyCode : event.charCode,
ctrl: event.ctrlKey, ctrl: event.ctrlKey,
shift: event.shiftKey, shift: event.shiftKey,
@ -1578,7 +1577,6 @@
propagate = tracker.keyHandler( propagate = tracker.keyHandler(
{ {
eventSource: tracker, eventSource: tracker,
position: getMouseRelative( event, tracker.element ),
keyCode: event.keyCode ? event.keyCode : event.charCode, keyCode: event.keyCode ? event.keyCode : event.charCode,
ctrl: event.ctrlKey, ctrl: event.ctrlKey,
shift: event.shiftKey, shift: event.shiftKey,