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({