feat(ES6 classes): adds the ES6 class syntax and functionality

henkkelder · Sep 30, 2016 · ed3b3ab · ed3b3ab
1 parent a6a59b3
commit ed3b3ab
Show file tree

Hide file tree

Showing 24 changed files with 345 additions and 366 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -7,4 +7,5 @@
   ],
   "disallowConstOutsideModuleScope": false,
   "requireArrowFunctions": true,
+  "disallowEmptyBlocks": false
 }
diff --git a/.jshintrc b/.jshintrc
@@ -36,5 +36,6 @@
   "unused": true,
   "-W116": true,
   "-W080": true,
-  "-W038": true
+  "-W038": true,
+  "proto": true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "0.12"
 
 sudo: false
 
 before_script:
   - npm install -g grunt-cli
 
 script:
-  - grunt test-travis
+  - grunt test-travis
diff --git a/src/hammer.js b/src/hammer.js
@@ -1,13 +1,13 @@
 import ifUndefined from './utils/if-undefined';
 import { TOUCH_ACTION_COMPUTE } from './touchactionjs/touchaction-Consts';
 import { DIRECTION_HORIZONTAL } from './inputjs/input-consts';
-import { RotateRecognizer } from './recognizers/rotate';
-import { PinchRecognizer } from './recognizers/pinch';
-import { SwipeRecognizer } from './recognizers/swipe';
-import { PanRecognizer } from './recognizers/pan';
-import { TapRecognizer } from './recognizers/tap';
-import { PressRecognizer } from './recognizers/press';
-import { Manager } from './manager';
+import RotateRecognizer from './recognizers/rotate';
+import PinchRecognizer from './recognizers/pinch';
+import SwipeRecognizer from './recognizers/swipe';
+import PanRecognizer from './recognizers/pan';
+import TapRecognizer from './recognizers/tap';
+import PressRecognizer from './recognizers/press';
+import  Manager  from './manager';
 
 /**
  * @private
@@ -16,10 +16,12 @@ import { Manager } from './manager';
  * @param {Object} [options]
  * @constructor
  */
-function Hammer(element, options) {
-  options = options || {};
-  options.recognizers = ifUndefined(options.recognizers, Hammer.defaults.preset);
-  return new Manager(element, options);
+export default class Hammer {
+  constructor(element, options) {
+    options = options || {};
+    options.recognizers = ifUndefined(options.recognizers, Hammer.defaults.preset);
+    return new Manager(element, options);
+  }
 }
 
 /**
@@ -153,5 +155,3 @@ Hammer.defaults = {
     tapHighlightColor: 'rgba(0,0,0,0)'
   }
 };
-
-export { Hammer };
diff --git a/src/input/mouse.js b/src/input/mouse.js
@@ -4,8 +4,7 @@ import {
     INPUT_END,
     INPUT_TYPE_MOUSE
 } from '../inputjs/input-consts';
-import { Input } from '../inputjs/input-constructor';
-import inherit from '../utils/inherit';
+import Input from '../inputjs/input-constructor';
 
 const MOUSE_INPUT_MAP = {
   mousedown: INPUT_START,
@@ -22,16 +21,16 @@ const MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
  * @constructor
  * @extends Input
  */
-function MouseInput() {
-  this.evEl = MOUSE_ELEMENT_EVENTS;
-  this.evWin = MOUSE_WINDOW_EVENTS;
+export default class MouseInput extends Input {
+  constructor() {
+    super(...arguments);
 
-  this.pressed = false; // mousedown state
+    this.evEl = MOUSE_ELEMENT_EVENTS;
+    this.evWin = MOUSE_WINDOW_EVENTS;
 
-  Input.apply(this, arguments);
-}
+    this.pressed = false; // mousedown state
+  }
 
-inherit(MouseInput, Input, {
   /**
    * @private
    * handle mouse events
@@ -65,6 +64,4 @@ inherit(MouseInput, Input, {
       srcEvent: ev
     });
   }
-});
-
-export { MouseInput };
+}
diff --git a/src/input/pointerevent.js b/src/input/pointerevent.js
@@ -8,8 +8,7 @@ import {
     INPUT_TYPE_PEN,
     INPUT_TYPE_KINECT
 } from '../inputjs/input-consts';
-import { Input } from '../inputjs/input-constructor';
-import inherit from '../utils/inherit';
+import Input from '../inputjs/input-constructor';
 import inArray from '../utils/in-array';
 
 const POINTER_INPUT_MAP = {
@@ -43,16 +42,15 @@ if (window.MSPointerEvent && !window.PointerEvent) {
  * @constructor
  * @extends Input
  */
-function PointerEventInput() {
-  this.evEl = POINTER_ELEMENT_EVENTS;
-  this.evWin = POINTER_WINDOW_EVENTS;
+export default class PointerEventInput extends Input {
+  constructor() {
+    super(...arguments);
+    this.evEl = POINTER_ELEMENT_EVENTS;
+    this.evWin = POINTER_WINDOW_EVENTS;
 
-  Input.apply(this, arguments);
-
-  this.store = (this.manager.session.pointerEvents = []);
-}
+    this.store = (this.manager.session.pointerEvents = []);
+  }
 
-inherit(PointerEventInput, Input, {
   /**
    * @private
    * handle mouse events
@@ -101,6 +99,4 @@ inherit(PointerEventInput, Input, {
       store.splice(storeIndex, 1);
     }
   }
-});
-
-export { PointerEventInput };
+}
diff --git a/src/input/singletouch.js b/src/input/singletouch.js
@@ -5,8 +5,7 @@ import {
     INPUT_CANCEL,
     INPUT_TYPE_TOUCH
 } from '../inputjs/input-consts';
-import { Input } from '../inputjs/input-constructor';
-import inherit from '../utils/inherit';
+import Input from '../inputjs/input-constructor';
 import toArray from '../utils/to-array';
 import uniqueArray from '../utils/unique-array';
 
@@ -26,15 +25,16 @@ const SINGLE_TOUCH_WINDOW_EVENTS = 'touchstart touchmove touchend touchcancel';
  * @constructor
  * @extends Input
  */
-function SingleTouchInput() {
-  this.evTarget = SINGLE_TOUCH_TARGET_EVENTS;
-  this.evWin = SINGLE_TOUCH_WINDOW_EVENTS;
-  this.started = false;
+export default class SingleTouchInput extends Input {
+  constructor() {
+    super(...arguments);
+    this.evTarget = SINGLE_TOUCH_TARGET_EVENTS;
+    this.evWin = SINGLE_TOUCH_WINDOW_EVENTS;
+    this.started = false;
 
-  Input.apply(this, arguments);
-}
+    Input.apply(this, arguments);
+  }
 
-inherit(SingleTouchInput, Input, {
   handler(ev) {
     let type = SINGLE_TOUCH_INPUT_MAP[ev.type];
 
@@ -61,7 +61,7 @@ inherit(SingleTouchInput, Input, {
       srcEvent: ev
     });
   }
-});
+}
 
 /**
  * @private
@@ -80,5 +80,3 @@ function normalizeSingleTouches(ev, type) {
 
   return [all, changed];
 }
-
-export { SingleTouchInput };
diff --git a/src/input/touch.js b/src/input/touch.js
@@ -5,8 +5,7 @@ import {
     INPUT_CANCEL,
     INPUT_TYPE_TOUCH
 } from '../inputjs/input-consts';
-import { Input } from '../inputjs/input-constructor';
-import inherit from '../utils/inherit';
+import Input from '../inputjs/input-constructor';
 import toArray from '../utils/to-array';
 import hasParent from '../utils/has-parent';
 import uniqueArray from '../utils/unique-array';
@@ -26,14 +25,17 @@ const TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
  * @constructor
  * @extends Input
  */
-function TouchInput() {
-  this.evTarget = TOUCH_TARGET_EVENTS;
-  this.targetIds = {};
+export default class TouchInput extends Input {
 
-  Input.apply(this, arguments);
-}
+  constructor() {
+    TouchInput.prototype.evTarget = TOUCH_TARGET_EVENTS;
+    TouchInput.prototype.targetIds = {};
+    super(...arguments);
+
+    this.evTarget = TOUCH_TARGET_EVENTS;
+    this.targetIds = {};
+  }
 
-inherit(TouchInput, Input, {
   handler(ev) {
     let type = TOUCH_INPUT_MAP[ev.type];
     let touches = getTouches.call(this, ev, type);
@@ -48,7 +50,7 @@ inherit(TouchInput, Input, {
       srcEvent: ev
     });
   }
-});
+}
 
 /**
  * @private
@@ -111,5 +113,3 @@ function getTouches(ev, type) {
       changedTargetTouches
   ];
 }
-
-export { TouchInput };
diff --git a/src/input/touchmouse.js b/src/input/touchmouse.js
@@ -1,8 +1,7 @@
-import { Input } from '../inputjs/input-constructor';
-import inherit from '../utils/inherit';
+import Input from '../inputjs/input-constructor';
 import bindFn from '../utils/bind-fn';
-import { TouchInput } from './touch';
-import { MouseInput } from './mouse';
+import  TouchInput  from './touch';
+import  MouseInput  from './mouse';
 import {
     INPUT_START,
     INPUT_END,
@@ -25,18 +24,18 @@ import {
 const DEDUP_TIMEOUT = 2500;
 const DEDUP_DISTANCE = 25;
 
-function TouchMouseInput() {
-  Input.apply(this, arguments);
+export default class TouchMouseInput extends Input {
+  constructor() {
+    super(...arguments);
 
-  let handler = bindFn(this.handler, this);
-  this.touch = new TouchInput(this.manager, handler);
-  this.mouse = new MouseInput(this.manager, handler);
+    let handler = bindFn(this.handler, this);
+    this.touch = new TouchInput(this.manager, handler);
+    this.mouse = new MouseInput(this.manager, handler);
 
-  this.primaryTouch = null;
-  this.lastTouches = [];
-}
+    this.primaryTouch = null;
+    this.lastTouches = [];
+  }
 
-inherit(TouchMouseInput, Input, {
   /**
    * @private
    * handle mouse and touch events
@@ -60,7 +59,7 @@ inherit(TouchMouseInput, Input, {
     }
 
     this.callback(manager, inputEvent, inputData);
-  },
+  }
 
   /**
    * @private
@@ -70,7 +69,7 @@ inherit(TouchMouseInput, Input, {
     this.touch.destroy();
     this.mouse.destroy();
   }
-});
+}
 
 function recordTouches(eventType, eventData) {
   if (eventType & INPUT_START) {
@@ -110,5 +109,3 @@ function isSyntheticEvent(eventData) {
   }
   return false;
 }
-
-export { TouchMouseInput };
diff --git a/src/inputjs/create-input-instance.js b/src/inputjs/create-input-instance.js
@@ -1,9 +1,9 @@
 import { SUPPORT_POINTER_EVENTS,SUPPORT_ONLY_TOUCH,SUPPORT_TOUCH } from './input-consts';
 import inputHandler from './input-handler';
-import { PointerEventInput } from '../input/pointerevent';
-import { TouchInput } from '../input/touch';
-import { MouseInput } from '../input/mouse';
-import { TouchMouseInput } from '../input/touchmouse';
+import PointerEventInput from '../input/pointerevent';
+import TouchInput from '../input/touch';
+import MouseInput from '../input/mouse';
+import TouchMouseInput from '../input/touchmouse';
 
 /**
  * @private