Merge pull request #17 from azakus/ms

Enable IE 10 support, use MSPointerEvents as source
jquery-archive · Nov 1, 2012 · dd4a5cb · dd4a5cb
2 parents e08c4b1 + 8e983c9
commit dd4a5cb
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 5 deletions.
diff --git a/build/pointerevents.js b/build/pointerevents.js
diff --git a/samples/paint/index.html b/samples/paint/index.html
@@ -11,6 +11,7 @@
 }
   canvas {
     -ms-touch-action: none;
+    touch-action: none;
     background: lightgreen;
     margin: 0 auto;
     overflow: hidden;

diff --git a/samples/simple/index.html b/samples/simple/index.html
@@ -15,6 +15,8 @@
       }
       body {
         overflow: auto;
+        -ms-touch-action: none;
+        touch-action: none;
       }
       #capture {
         background-color: orange;

diff --git a/samples/spaceship/index.html b/samples/spaceship/index.html
@@ -27,6 +27,8 @@
       body {
         background-color: #000000;
         margin: 0px;
+        -ms-touch-action: none;
+        touch-action: none;
       }
       canvas {
         display:block;

diff --git a/samples/tracker/index.html b/samples/tracker/index.html
@@ -18,6 +18,8 @@
       body {
         background-color: #000000;
         margin: 0px;
+        -ms-touch-action: none;
+        touch-action: none;
       }
       canvas {
         background-color:#111133;

diff --git a/src/PointerEvent.js b/src/PointerEvent.js
@@ -34,8 +34,12 @@ function PointerEvent(inType, inDict) {
   //
   // {e}->{PointerEvent}->{MouseEvent}->{UIEvent}...
   var e = document.createEvent('MouseEvent');
-  e.__proto__ = PointerEvent.prototype;
-  e.initPointerEvent(inType, inDict);
+  if (Object.__proto__) {
+    e.__proto__ = PointerEvent.prototype;
+    e.initPointerEvent(inType, inDict);
+  } else {
+    PointerEvent.prototype.initPointerEvent.call(e, inType, inDict);
+  }
   return e;
 };
 

diff --git a/src/platform-events.js b/src/platform-events.js
@@ -53,7 +53,7 @@
     },
     findTarget: function(inEvent) {
       // TODO (dfreedman): support shadow.elementFromPoint here, when available
-      return document.elementFromPoint(inEvent.clientX, inEvent.clientY);
+      return document.elementFromPoint(inEvent.clientX, inEvent.clientY) || document;
     },
     touchstart: function(inEvent) {
       if (this.firstTouch === null) {
@@ -156,6 +156,53 @@
     }
   };
 
+  var msEvents = {
+    events: [
+      'MSPointerDown',
+      'MSPointerMove',
+      'MSPointerUp',
+      'MSPointerOut',
+      'MSPointerOver',
+      'MSPointerCancel'
+    ],
+    POINTER_TYPES: [
+      'NOT USED',
+      'unavailable',
+      'touch',
+      'pen',
+      'mouse'
+    ],
+    prepareEvent: function(inEvent) {
+      var e = dispatcher.cloneEvent(inEvent);
+      e.pointerType = this.POINTER_TYPES[inEvent.pointerType];
+      return e;
+    },
+    MSPointerDown: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.down(e);
+    },
+    MSPointerMove: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.move(e);
+    },
+    MSPointerUp: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.up(e);
+    },
+    MSPointerOut: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.out(e);
+    },
+    MSPointerOver: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.over(e);
+    },
+    MSPointerCancel: function(inEvent) {
+      var e = this.prepareEvent(inEvent);
+      dispatcher.cancel(e);
+    }
+  }
+
   // only activate if this platform does not have pointer events
   if (window.navigator.pointerEnabled === undefined) {
     // We fork the initialization of dispatcher event listeners here because
@@ -172,11 +219,17 @@
     //
     // Therefore we choose to only listen to native touch events if they exist.
 
-    if ('ontouchstart' in window) {
+    if (window.navigator.msPointerEnabled) {
+      dispatcher.registerSource('ms', msEvents);
+      if (window.navigator.msMaxTouchPoints !== undefined) {
+        Object.defineProperty(window.navigator, 'maxTouchPoints', {value: window.navigator.msMaxTouchPoints, enumerable: true});
+      }
+    } else if ('ontouchstart' in window) {
       dispatcher.registerSource('touch', touchEvents);
     } else {
       dispatcher.registerSource('mouse', mouseEvents);
     }
+
     dispatcher.registerTarget(document);
     Object.defineProperty(window.navigator, 'pointerEnabled', {value: true, enumerable: true});
   }