From ab500f2e0cef8a3b11ab44cdcb20105987b870f9 Mon Sep 17 00:00:00 2001
From: Andrew <andytjoslin@gmail.com>
Date: Tue, 8 Jul 2014 08:26:55 -0600
Subject: [PATCH] fix(sideMenu): when a drag on content is disallowed, do not
 prevent default

Closes #1725
---
 js/angular/controller/sideMenuController.js | 33 +++++++++++++--------
 js/controllers/sideMenuController.js        | 19 +-----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/js/angular/controller/sideMenuController.js b/js/angular/controller/sideMenuController.js
index e02d1a905e8..c2a46554b4a 100644
--- a/js/angular/controller/sideMenuController.js
+++ b/js/angular/controller/sideMenuController.js
@@ -9,7 +9,6 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform) {
   extend(this, ionic.controllers.SideMenuController.prototype);
 
   this.$scope = $scope;
-  this.dragThreshold = 25;
 
   ionic.controllers.SideMenuController.call(this, {
     left: { width: 275 },
@@ -23,26 +22,36 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform) {
     return $scope.dragContent;
   };
 
-  this.dragThreshold = 25;
-  this.dragOnlyEdge = false;
+  this.edgeThreshold = 25;
+  this.edgeThresholdEnabled = false;
   this.edgeDragThreshold = function(value) {
     if (arguments.length) {
       if (angular.isNumber(value) && value > 0) {
-        this.dragThreshold = value;
-        this.dragOnlyEdge = true;
+        this.edgeThreshold = value;
+        this.edgeThresholdEnabled = true;
       } else {
-        this.dragOnlyEdge = !!value;
+        this.edgeThresholdEnabled = !!value;
       }
     }
-    return this.dragOnlyEdge;
+    return this.edgeThresholdEnabled;
   };
 
   this.isDraggableTarget = function(e) {
-    return (self.isOpen() || $scope.dragContent) &&
-           (!e.gesture.srcEvent.defaultPrevented &&
-            !e.target.tagName.match(/input|textarea|select|object|embed/i) &&
-            !e.target.isContentEditable &&
-            !(e.target.dataset ? e.target.dataset.preventScroll : e.target.getAttribute('data-prevent-default') == 'true'));
+    var startX = e.gesture.startEvent && e.gesture.startEvent.center &&
+      e.gesture.startEvent.center.pageX;
+
+    //Only restrict edge when sidemenu is closed and it's enabled
+    var shouldAllowOnlyEdgeDrag = self.edgeThresholdEnabled && !self.isOpen();
+    var dragIsWithinBounds = !shouldAllowOnlyEdgeDrag ||
+      startX <= this.edgeThreshold ||
+      startX >= this.content.offsetWidth - this.edgeThreshold;
+
+    return ($scope.dragContent || self.isOpen()) &&
+           dragIsWithinBounds &&
+           !e.gesture.srcEvent.defaultPrevented &&
+           !e.target.tagName.match(/input|textarea|select|object|embed/i) &&
+           !e.target.isContentEditable &&
+           !(e.target.dataset ? e.target.dataset.preventScroll : e.target.getAttribute('data-prevent-default') == 'true');
   };
 
   $scope.sideMenuContentTranslateX = 0;
diff --git a/js/controllers/sideMenuController.js b/js/controllers/sideMenuController.js
index 4174f2b65e6..2fbc20b156e 100644
--- a/js/controllers/sideMenuController.js
+++ b/js/controllers/sideMenuController.js
@@ -278,28 +278,11 @@
       this._startX = null;
       this._lastX = null;
       this._offsetX = null;
-      this._firstX = null;
-      this._doDrag = false;
     },
 
     // Handle a drag event
     _handleDrag: function(e) {
 
-      //Get the start position of the drag
-      if (!this._firstX) {
-       this._firstX = e.gesture.touches[0].pageX;
-       this.content._cachedWidth = this.content.element.offsetWidth;
-      }
-
-      //Allow the drag to affect the side if:
-      // - the side menu is already opened, or
-      // - there is no edge drag threshold enabled, or
-      // - the drag is within the edge drag threshold
-      this._doDrag = this.isOpen() ||
-        !this.edgeDragThreshold() ||
-        this._firstX <= this.dragThreshold ||
-        this._firstX >= this.content._cachedWidth - this.dragThreshold;
-
       // If we don't have start coords, grab and store them
       if(!this._startX) {
         this._startX = e.gesture.touches[0].pageX;
@@ -310,7 +293,7 @@
       }
 
       // Calculate difference from the tap points
-      if(!this._isDragging && this._doDrag && Math.abs(this._lastX - this._startX) > this.dragThresholdX) {
+      if(!this._isDragging && Math.abs(this._lastX - this._startX) > this.dragThresholdX) {
         // if the difference is greater than threshold, start dragging using the current
         // point as the starting point
         this._startX = this._lastX;