Building out more abstract adapters and added pointer adapter

Author: stuyam

License

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015 - 2016 Stuart Yamartino.
+Copyright (c) 2015 - 2017 Stuart Yamartino.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/adapters/adapter.js

@@ -52,7 +52,7 @@ class Adapter{
   }
 
   bindUnsupportedEvent(){
-    this.add(isMobile ? 'touchstart' : 'mousedown', (event) => this.runClosure('unsupported', event));
+    this.add(supportsTouch ? 'touchstart' : 'mousedown', (event) => this.runClosure('unsupported', event));
   }
 
   _startPress(event){

src/adapters/adapter_pointer.js

@@ -0,0 +1,40 @@
+/*
+This adapter is for devices that support pointer events.
+*/
+
+class AdapterPointer extends Adapter{
+
+  constructor(el, block, options){
+    super(el, block, options);
+  }
+
+  bindEvents(){
+    this.add('pointerdown', this.supportTest.bind(this, 0));
+    this.add('pointermove', this.change.bind(this));
+    this.add('pointerdown', this.supportTest.bind(this, 0));
+    this.add('pointerup', this._endPress.bind(this));
+  }
+
+  supportTest(iter, event, runKey = this.runKey){
+    if(this.isPressed() === false){
+      if(iter <= 6){
+        iter++;
+        setTimeout(this.supportTest.bind(this, iter, event, runKey), 10);
+      } else {
+        this.fail(event, runKey);
+      }
+    }
+  }
+
+  change(event){
+    if(this.isPressed() && event.pressure > 0){
+      this._changePress(event.pressure, event);
+      this.deepPress(event);
+    }
+  }
+
+  returnTouch(event){
+    event.pressure >= 0.5 ? this._startDeepPress(event) : this._endDeepPress();
+  }
+
+}

src/config.js

@@ -10,7 +10,7 @@ var Config = {
   // 'true' prevents the selecting of text and images via css properties
   preventSelect: true,
 
-  // 'mobile' or 'desktop' will make it run only on that type of device
+  // 'touch', 'mouse', or 'pointer' will make it run only on that type of device
   only: null,
 
   // this will get the correct config / option settings for the current pressure check

src/element.js

@@ -7,12 +7,16 @@ class Element{
 
   routeEvents(el, block, options){
     var type = Config.get('only', options);
-    // if on desktop and requesting Force Touch or not requesting 3D Touch
-    if(isDesktop && (type === 'desktop' || type !== 'mobile')){
+    // for devices that support pointer events
+    if(supportsPointer && (type === 'pointer' || type === null)){
+      this.adapter = new AdapterPointer(el, block, options).bindEvents();
+    }
+    // for devices that support Force Touch
+    else if(supportsMouse && (type === 'mouse' || type === null)){
       this.adapter = new AdapterForceTouch(el, block, options).bindEvents();
     }
-    // if on mobile and requesting 3D Touch or not requestion Force Touch
-    else if(isMobile && (type === 'mobile' || type !== 'desktop')){
+    // for devices that support 3D Touch
+    else if(supportsTouch && (type === 'touch' || type === null)){
       this.adapter = new Adapter3DTouch(el, block, options).bindEvents();
     }
     // unsupported if it is requesting a type and your browser is of other type

src/helpers.js

@@ -33,13 +33,16 @@ var map = function(x, in_min, in_max, out_min, out_max){
   return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }
 
-var isDesktop = false;
-var isMobile = false;
+var supportsMouse            = false;
+var supportsTouch            = false;
+var supportsPointer          = false;
 var supportsTouchForceChange = false;
+
 if (typeof window !== 'undefined') {
   // only attempt to assign these in a browser environment.
   // on the server, this is a no-op, like the rest of the library
-  isMobile = 'ontouchstart' in window.document;
-  isDesktop = !isMobile;
+  supportsTouch            = 'ontouchstart'       in window.document;
+  supportsMouse            = 'onmousemove'        in window.document && !supportsTouch;
+  supportsPointer          = 'onpointermove'      in window.document;
   supportsTouchForceChange = 'ontouchforcechange' in window.document;
 }