javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sideMenu): enable menu w/ different historyId back view

Browse Source
This commit is contained in:
Adam Bradley
2014-12-03 23:28:00 -06:00
parent 74cc98039b
commit 6a1c53301c
3 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/angular/controller/sideMenuController.js vendored
View File

@@ -368,7 +368,12 @@ function($scope, $attrs, $ionicSideMenuDelegate, $ionicPlatform, $ionicBody, $io
startX <= self.edgeThreshold ||
startX >= self.content.element.offsetWidth - self.edgeThreshold;
var menuEnabled = self.enableMenuWithBackViews() ? true : !$ionicHistory.backView();
var backView = $ionicHistory.backView();
var menuEnabled = enableMenuWithBackViews ? true : !backView;
if (!menuEnabled) {
var currentView = $ionicHistory.currentView() || {};
return backView.historyId !== currentView.historyId;
}
return ($scope.dragContent || self.isOpen()) &&
dragIsWithinBounds &&