Moved failOrShim to the parent adapter class

yehr59 · Mar 8, 2016 · fbf85aa · fbf85aa
1 parent 6ff8660
commit fbf85aa
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 55 deletions.
diff --git a/dist/jquery.pressure.js b/dist/jquery.pressure.js
@@ -102,6 +102,17 @@ var Adapter = (function () {
     value: function setDeepPressed(boolean) {
       this.deepPressed = boolean;
     }
+  }, {
+    key: 'failOrShim',
+    value: function failOrShim(event) {
+      Support.didFail();
+      // is the shim option set
+      if (Config.get('shim', this.element.options) === true) {
+        this.shim = new AdapterShim(this.element, event);
+      } else {
+        runClosure(this.block, 'unsupported', this.el);
+      }
+    }
 
     // prevent the default action of text selection, "peak & pop", and force touch special feature
 
@@ -166,7 +177,6 @@ var Adapter3DTouch = (function (_Adapter) {
           iter += 1;
           setTimeout(this.supportCallback.bind(this), 10, iter, event);
         } else if (this.pressed) {
-          Support.didFail();
           this.failOrShim(event);
         }
       } else if (Support.forPressure || this.shim instanceof AdapterShim) {
@@ -175,16 +185,6 @@ var Adapter3DTouch = (function (_Adapter) {
         this.failOrShim(event);
       }
     }
-  }, {
-    key: 'failOrShim',
-    value: function failOrShim(event) {
-      // is the shim option set
-      if (Config.get('shim', this.element.options) === true) {
-        this.shim = new AdapterShim(this.element, event);
-      } else {
-        runClosure(this.block, 'unsupported', this.el);
-      }
-    }
   }, {
     key: '$start',
     value: function $start() {
@@ -320,13 +320,7 @@ var AdapterForceTouch = (function (_Adapter2) {
         this.remove('webkitmouseforcewillbegin', this.forceTouchEnabled);
         this.preventDefault(event);
       } else {
-        Support.didFail();
-        // is the shim option set
-        if (Config.get('shim', this.element.options) === true) {
-          this.shim = new AdapterShim(this.element, event);
-        } else {
-          runClosure(this.block, 'unsupported', this.el);
-        }
+        this.failOrShim(event);
       }
     }
   }, {

diff --git a/dist/jquery.pressure.min.js b/dist/jquery.pressure.min.js
diff --git a/dist/pressure.js b/dist/pressure.js
@@ -107,6 +107,17 @@ var Adapter = (function () {
     value: function setDeepPressed(boolean) {
       this.deepPressed = boolean;
     }
+  }, {
+    key: 'failOrShim',
+    value: function failOrShim(event) {
+      Support.didFail();
+      // is the shim option set
+      if (Config.get('shim', this.element.options) === true) {
+        this.shim = new AdapterShim(this.element, event);
+      } else {
+        runClosure(this.block, 'unsupported', this.el);
+      }
+    }
 
     // prevent the default action of text selection, "peak & pop", and force touch special feature
 
@@ -171,7 +182,6 @@ var Adapter3DTouch = (function (_Adapter) {
           iter += 1;
           setTimeout(this.supportCallback.bind(this), 10, iter, event);
         } else if (this.pressed) {
-          Support.didFail();
           this.failOrShim(event);
         }
       } else if (Support.forPressure || this.shim instanceof AdapterShim) {
@@ -180,16 +190,6 @@ var Adapter3DTouch = (function (_Adapter) {
         this.failOrShim(event);
       }
     }
-  }, {
-    key: 'failOrShim',
-    value: function failOrShim(event) {
-      // is the shim option set
-      if (Config.get('shim', this.element.options) === true) {
-        this.shim = new AdapterShim(this.element, event);
-      } else {
-        runClosure(this.block, 'unsupported', this.el);
-      }
-    }
   }, {
     key: '$start',
     value: function $start() {
@@ -325,13 +325,7 @@ var AdapterForceTouch = (function (_Adapter2) {
         this.remove('webkitmouseforcewillbegin', this.forceTouchEnabled);
         this.preventDefault(event);
       } else {
-        Support.didFail();
-        // is the shim option set
-        if (Config.get('shim', this.element.options) === true) {
-          this.shim = new AdapterShim(this.element, event);
-        } else {
-          runClosure(this.block, 'unsupported', this.el);
-        }
+        this.failOrShim(event);
       }
     }
   }, {

diff --git a/dist/pressure.min.js b/dist/pressure.min.js
diff --git a/src/adapter.js b/src/adapter.js
@@ -24,6 +24,16 @@ class Adapter{
     this.deepPressed = boolean;
   }
 
+  failOrShim(event){
+    Support.didFail();
+    // is the shim option set
+    if(Config.get('shim', this.element.options) === true){
+      this.shim = new AdapterShim(this.element, event);
+    } else {
+      runClosure(this.block, 'unsupported', this.el);
+    }
+  }
+
   // prevent the default action of text selection, "peak & pop", and force touch special feature
   preventDefault(event){
     if(Config.get('preventDefault', this.element.options) === true){

diff --git a/src/adapter_3d_touch.js b/src/adapter_3d_touch.js
@@ -34,7 +34,6 @@ class Adapter3DTouch extends Adapter{
         iter += 1;
         setTimeout(this.supportCallback.bind(this), 10, iter, event);
       } else if(this.pressed){
-        Support.didFail();
         this.failOrShim(event);
       }
     } else if(Support.forPressure || this.shim instanceof AdapterShim){
@@ -44,15 +43,6 @@ class Adapter3DTouch extends Adapter{
     }
   }
 
-  failOrShim(event){
-    // is the shim option set
-    if(Config.get('shim', this.element.options) === true){
-      this.shim = new AdapterShim(this.element, event);
-    } else {
-      runClosure(this.block, 'unsupported', this.el);
-    }
-  }
-
   $start(){
     // call 'start' when the touch goes down
     this.add('touchstart', (event) => {

diff --git a/src/adapter_force_touch.js b/src/adapter_force_touch.js
@@ -26,13 +26,7 @@ class AdapterForceTouch extends Adapter{
       this.remove('webkitmouseforcewillbegin', this.forceTouchEnabled);
       this.preventDefault(event);
     } else {
-       Support.didFail();
-      // is the shim option set
-      if(Config.get('shim', this.element.options) === true){
-        this.shim = new AdapterShim(this.element, event);
-      } else {
-        runClosure(this.block, 'unsupported', this.el);
-      }
+      this.failOrShim(event);
     }
   }