From b4a69fa693576415c025f90ebb2db15419c2130e Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 7 Nov 2013 16:27:03 -0600
Subject: [PATCH] Fixed #27 - drag and scroll

---
 dist/js/ionic-angular.js                      | 14 +++++++++++++-
 js/ext/angular/src/directive/ionicSideMenu.js | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 1c8c3215d1..b1839a77c5 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -1030,12 +1030,24 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
 
         $element.addClass('menu-content');
 
+        var defaultPrevented = false;
+
+        ionic.on('mousedown', function(e) {
+          defaultPrevented = e.defaultPrevented;
+        });
+
         Gesture.on('drag', function(e) {
+          if(defaultPrevented) {
+            return;
+          }
           sideMenuCtrl._handleDrag(e);
         }, $element[0]);
 
         Gesture.on('release', function(e) {
-          sideMenuCtrl._endDrag(e);
+          if(!defaultPrevented) {
+            sideMenuCtrl._endDrag(e);
+          }
+          defaultPrevented = false;
         }, $element[0]);
 
         sideMenuCtrl.setContent({
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
index 6eeee5cb37..2a45b70cf1 100644
--- a/js/ext/angular/src/directive/ionicSideMenu.js
+++ b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -65,12 +65,24 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
 
         $element.addClass('menu-content');
 
+        var defaultPrevented = false;
+
+        ionic.on('mousedown', function(e) {
+          defaultPrevented = e.defaultPrevented;
+        });
+
         Gesture.on('drag', function(e) {
+          if(defaultPrevented) {
+            return;
+          }
           sideMenuCtrl._handleDrag(e);
         }, $element[0]);
 
         Gesture.on('release', function(e) {
-          sideMenuCtrl._endDrag(e);
+          if(!defaultPrevented) {
+            sideMenuCtrl._endDrag(e);
+          }
+          defaultPrevented = false;
         }, $element[0]);
 
         sideMenuCtrl.setContent({