Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ebd76d5

Browse files
committedDec 29, 2015
fix(menu): change scroll restriction. #4869
1 parent fe3aeac commit ebd76d5

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed
 

‎js/angular/controller/sideMenuController.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
304304

305305
isAsideExposed = shouldExposeAside;
306306
if ((self.left && self.left.isEnabled) && (self.right && self.right.isEnabled)) {
307-
console.log('Setting left and right');
308307
self.content.setMarginLeftAndRight(isAsideExposed ? self.left.width : 0, isAsideExposed ? self.right.width : 0);
309308
} else if (self.left && self.left.isEnabled) {
310309
// set the left marget width if it should be exposed
@@ -359,7 +358,7 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
359358

360359
if (isDragging) {
361360
self.openAmount(offsetX + (lastX - startX));
362-
self.content.setCanScroll(false);
361+
//self.content.setCanScroll(false);
363362
}
364363
};
365364

‎js/views/scrollViewNative.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
};
452452

453453
self.handleTouchMove = function(e) {
454-
if(self.__frozen || self.__frozenShut) {
454+
if(self.__frozenShut) {
455455
e.preventDefault();
456456
e.stopPropagation();
457457
return false;

0 commit comments

Comments
 (0)
Please sign in to comment.