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

refactor(backButton): separate show/enable logic

Browse Source 
Previously the showBack property was setting if the back button should
or should not be enabled, and it was also used if the back button
should be hidden or not for the view. Changed it so there are now two
concepts, where showBack is visual only, and enableBack determines if
it should show according to $ionicHistory and navigation info.
This commit is contained in:
Adam Bradley
2014-11-19 11:38:14 -06:00
parent 387b1eef79
commit b4e4055a06
11 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/angular/controller/headerBarController.js vendored
View File

@@ -21,7 +21,8 @@ function($scope, $element, $attrs, $q, $ionicConfig, $ionicHistory) {
var titleLeft = 0;
var titleRight = 0;
var titleCss = '';
var isBackShown;
var isBackEnabled = false;
var isBackShown = false;
var titleTextWidth = 0;
@@ -40,13 +41,25 @@ function($scope, $element, $attrs, $q, $ionicConfig, $ionicHistory) {
};
self.enableBack = function(shouldEnable) {
// whether or not the back button show be visible, according
// to the navigation and history
if (arguments.length && shouldEnable !== isBackEnabled) {
var backBtnEle = getEle(BACK_BUTTON);
backBtnEle && backBtnEle.classList[ shouldEnable ? 'remove' : 'add' ](HIDE);
isBackEnabled = shouldEnable;
}
return isBackEnabled;
};
self.showBack = function(shouldShow) {
// different from enableBack() because this will always have the back
// visually hidden if false, even if the history says it should show
if (arguments.length && shouldShow !== isBackShown) {
var backBtnEle = getEle(BACK_BUTTON);
if (backBtnEle) {
backBtnEle.classList[ shouldShow ? 'remove' : 'add' ](HIDE);
isBackShown = shouldShow;
}
if (backBtnEle) backBtnEle.style.display = (shouldShow ? '' : 'none');
isBackShown = shouldShow;
}
return isBackShown;
};
@@ -109,6 +122,7 @@ function($scope, $element, $attrs, $q, $ionicConfig, $ionicHistory) {
defaultTitleEle.classList.remove(HIDE);
}
}
self.showBack(true);
};