Merge remote-tracking branch 'origin/thomas/fix-issue-10884'

Conflicts: package-lock.json package.json
team-avesta · Mar 22, 2018 · be958ff · be958ff
2 parents c62282f + effe15d
commit be958ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -88,4 +88,4 @@
     "test:full": "gulp karma",
     "lint": "eslint ."
   }
-}
+}
diff --git a/src/core/services/gesture/gesture.js b/src/core/services/gesture/gesture.js
@@ -6,7 +6,8 @@ var HANDLERS = {};
  * as well as other information abstracted from the DOM.
  */
 
-var pointer, lastPointer, forceSkipClickHijack = false, maxClickDistance = 6;
+var pointer, lastPointer, maxClickDistance = 6;
+var forceSkipClickHijack = false, disableAllGestures = false;
 
 /**
  * The position of the most recent click if that click was on a label element.
@@ -52,6 +53,10 @@ function MdGestureProvider() { }
 
 MdGestureProvider.prototype = {
 
+  disableAll : function() {
+    disableAllGestures = true;
+  },
+
   // Publish access to setter to configure a variable  BEFORE the
   // $mdGesture service is instantiated...
   skipClickHijack: function() {
@@ -512,6 +517,7 @@ function MdGestureHandler() {
  * @ngInject
  */
 function attachToDocument( $mdGesture, $$MdGestureHandler ) {
+  if ( disableAllGestures ) return;
 
   // Polyfill document.contains for IE11.
   // TODO: move to util
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,4 +88,4 @@ @@
         "test:full": "gulp karma",
         "lint": "eslint ."
       }
-    }
+    }