fix(menu): change scroll restriction. #4869

ionic-team · Dec 29, 2015 · ebd76d5 · ebd76d5
1 parent fe3aeac
commit ebd76d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/js/angular/controller/sideMenuController.js b/js/angular/controller/sideMenuController.js
@@ -304,7 +304,6 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
 
     isAsideExposed = shouldExposeAside;
     if ((self.left && self.left.isEnabled) && (self.right && self.right.isEnabled)) {
-      console.log('Setting left and right');
       self.content.setMarginLeftAndRight(isAsideExposed ? self.left.width : 0, isAsideExposed ? self.right.width : 0);
     } else if (self.left && self.left.isEnabled) {
       // set the left marget width if it should be exposed
@@ -359,7 +358,7 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
 
     if (isDragging) {
       self.openAmount(offsetX + (lastX - startX));
-      self.content.setCanScroll(false);
+      //self.content.setCanScroll(false);
     }
   };
 

diff --git a/js/views/scrollViewNative.js b/js/views/scrollViewNative.js
@@ -451,7 +451,7 @@
       };
 
       self.handleTouchMove = function(e) {
-        if(self.__frozen || self.__frozenShut) {
+        if(self.__frozenShut) {
           e.preventDefault();
           e.stopPropagation();
           return false;