From 0e89fb3aee24919b9abc9d383886a4a2ac3972b5 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 8 Jul 2014 08:39:44 -0600 Subject: [PATCH] refactor(sideMenu#isDraggableTarget): clearer wording --- js/angular/controller/sideMenuController.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/angular/controller/sideMenuController.js b/js/angular/controller/sideMenuController.js index 13bb59df58..e9ddc02658 100644 --- a/js/angular/controller/sideMenuController.js +++ b/js/angular/controller/sideMenuController.js @@ -37,12 +37,12 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform) { }; this.isDraggableTarget = function(e) { + //Only restrict edge when sidemenu is closed and restriction is enabled + var shouldOnlyAllowEdgeDrag = self.edgeThresholdEnabled && !self.isOpen(); 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 || + var dragIsWithinBounds = !shouldOnlyAllowEdgeDrag || startX <= self.edgeThreshold || startX >= self.content.offsetWidth - self.edgeThreshold;