Replace PointerMap with polyfill for regular Map

pointerevents.js

@@ -1,5 +1,5 @@
 import dispatcher from 'dispatcher';
-import PointerMap from 'pointermap';
+import Map from 'map';
 import Installer from 'installer';
 import targeting from 'targeting';
 import PointerEvent from 'PointerEvent';
@@ -15,6 +15,6 @@ export default {
   dispatcher: dispatcher,
   Installer: Installer,
   PointerEvent: PointerEvent,
-  PointerMap: PointerMap,
+  Map: Map,
   targetFinding: targeting
 };

src/dispatcher.js

@@ -1,4 +1,4 @@
-import PointerMap from 'pointermap';
+import Map from 'map';
 
 var CLONE_PROPS = [
 
@@ -99,7 +99,7 @@ var HAS_SVG_INSTANCE = (typeof SVGElementInstance !== 'undefined');
  *   - pointercancel: a pointer will no longer generate events
  */
 var dispatcher = {
-  pointermap: new PointerMap(),
+  pointermap: new Map(),
   eventMap: Object.create(null),
   captureInfo: Object.create(null),
 

src/pointermap.js → src/map.js

@@ -1,20 +1,17 @@
 /**
  * This module implements an map of pointer states
  */
-var USE_MAP = window.Map && window.Map.prototype.forEach;
-var POINTERS_FN = function() { return this.size; };
-function PointerMap() {
-  if (USE_MAP) {
-    var m = new Map();
-    m.pointers = POINTERS_FN;
-    return m;
+var USE_EXISTING_MAP = window.Map && window.Map.prototype.forEach;
+function Map() {
+  if (USE_EXISTING_MAP) {
+    return new window.Map();
   } else {
     this.keys = [];
     this.values = [];
   }
 }
 
-PointerMap.prototype = {
+Map.prototype = {
   set: function(inId, inEvent) {
     var i = this.keys.indexOf(inId);
     if (i > -1) {
@@ -49,9 +46,9 @@ PointerMap.prototype = {
       callback.call(thisArg, v, this.keys[i], this);
     }, this);
   },
-  pointers: function() {
+  get size() {
     return this.keys.length;
   }
 };
 
-export default PointerMap;
+export default Map;

src/touch.js

@@ -112,7 +112,7 @@ var touchEvents = {
   setPrimaryTouch: function(inTouch) {
 
     // set primary touch if there no pointers, or the only pointer is the mouse
-    if (pointermap.pointers() === 0 || (pointermap.pointers() === 1 && pointermap.has(1))) {
+    if (pointermap.size === 0 || (pointermap.size === 1 && pointermap.has(1))) {
       this.firstTouch = inTouch.identifier;
       this.firstXY = { X: inTouch.clientX, Y: inTouch.clientY };
       this.scrolling = false;
@@ -233,9 +233,9 @@ var touchEvents = {
   vacuumTouches: function(inEvent) {
     var tl = inEvent.touches;
 
-    // pointermap.pointers() should be < tl.length here, as the touchstart has not
+    // pointermap.size should be < tl.length here, as the touchstart has not
     // been processed yet.
-    if (pointermap.pointers() >= tl.length) {
+    if (pointermap.size >= tl.length) {
       var d = [];
       pointermap.forEach(function(value, key) {
 

tests/intern.js

@@ -23,7 +23,7 @@ define({
     'tests/unit/constructor',
     'tests/unit/dispatcher',
     'tests/unit/loader',
-    'tests/unit/pointermap'
+    'tests/unit/map'
   ],
   functionalSuites: [
 

tests/unit/loader.js

@@ -16,8 +16,8 @@ define([
       test('PointerEventsPolyfill', function() {
         expect(pep).to.be.ok;
       });
-      test('PointerMap', function() {
-        expect(pep.PointerMap).to.be.ok;
+      test('Map', function() {
+        expect(pep.Map).to.be.ok;
       });
       test('Dispatcher', function() {
         expect(pep.dispatcher).to.be.ok;

tests/unit/map.js

@@ -0,0 +1,73 @@
+define([
+  '../support/tdd',
+  'intern/chai!expect',
+  'pep'
+], function(tdd, expect, pep) {
+  var suite = tdd.suite;
+  var test = tdd.test;
+
+  suite('Map', function() {
+    var Map = pep.Map;
+    test('PEP Map has Map API', function() {
+      var keys = [
+        'set',
+        'get',
+        'has',
+        'delete',
+        'size',
+        'clear',
+        'forEach'
+      ];
+      var e = expect(Map.prototype);
+      keys.forEach(function(k) {
+        e.to.have.ownProperty(k);
+      });
+    });
+    test('Map .set', function() {
+      var p = new Map();
+      p.set(1, true);
+      expect(p.size).to.equal(1);
+    });
+    test('Map .size', function() {
+      var p = new Map();
+      expect(p.size).to.be.a('number');
+      expect(p.size).to.equal(0);
+      p.set(1, true);
+      expect(p.size).to.equal(1);
+      p.set(1, false);
+      expect(p.size).to.equal(1);
+    });
+    test('Map .has', function() {
+      var p = new Map();
+      p.set(1, true);
+      expect(p.has(1)).to.equal(true);
+      expect(p.has(0)).to.equal(false);
+    });
+    test('Map .delete', function() {
+      var p = new Map();
+      p.set(1, true);
+      p.set(2, false);
+      expect(p.size).to.equal(2);
+      p.delete(1);
+      expect(p.size).to.equal(1);
+      expect(p.get(2)).to.equal(false);
+    });
+    test('Map .clear', function() {
+      var p = new Map();
+      p.set(1, true);
+      p.clear();
+      expect(p.size).to.equal(0);
+    });
+    test('Map .forEach', function() {
+      var p = new Map();
+      p.set(1, true);
+      p.set(2, false);
+      p.set(3, {});
+      p.forEach(function(v, k, m) {
+        expect(k).to.be.ok;
+        expect(v).to.equal(p.get(k));
+        expect(m).to.equal(p);
+      });
+    });
+  });
+});