fix(navigation): preventing swipe-to-go-back when side-menu is open o…

…n the right
ionic-team · Apr 11, 2016 · 9c614d3 · 9c614d3
1 parent b0218b5
commit 9c614d3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/js/angular/controller/navViewController.js b/js/angular/controller/navViewController.js
@@ -11,7 +11,8 @@ IonicModule
   '$ionicViewSwitcher',
   '$ionicConfig',
   '$ionicScrollDelegate',
-function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate, $ionicNavViewDelegate, $ionicHistory, $ionicViewSwitcher, $ionicConfig, $ionicScrollDelegate) {
+  '$ionicSideMenuDelegate',
+function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate, $ionicNavViewDelegate, $ionicHistory, $ionicViewSwitcher, $ionicConfig, $ionicScrollDelegate, $ionicSideMenuDelegate) {
 
   var DATA_ELE_IDENTIFIER = '$eleId';
   var DATA_DESTROY_ELE = '$destroyEle';
@@ -353,7 +354,7 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
     var cancelData = {};
 
     function onDragStart(ev) {
-      if (!isPrimary || !$ionicConfig.views.swipeBackEnabled() ) return;
+      if (!isPrimary || !$ionicConfig.views.swipeBackEnabled() || $ionicSideMenuDelegate.isOpenRight() ) return;
 
 
       startDragX = getDragX(ev);