mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
fix(headerBar): view header bars stay under nav bars
This commit is contained in:
5
js/angular/controller/navBarController.js
vendored
5
js/angular/controller/navBarController.js
vendored
@@ -374,11 +374,6 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
|
||||
}
|
||||
|
||||
|
||||
$scope.$on('ionHeaderBar.init', function(ev) {
|
||||
ev.stopPropagation();
|
||||
});
|
||||
|
||||
|
||||
$scope.$on('$destroy', function() {
|
||||
$scope.$parent.$hasHeader = false;
|
||||
$element.parent().removeData(DATA_NAV_BAR_CTRL);
|
||||
|
||||
7
js/angular/controller/viewController.js
vendored
7
js/angular/controller/viewController.js
vendored
@@ -20,16 +20,9 @@ function($scope, $element, $attrs, $compile, $ionicHistory, $ionicViewSwitcher)
|
||||
navBarDelegateHandle = delegateHandle;
|
||||
});
|
||||
|
||||
var deregIonHeaderBarInit = $scope.$on('ionHeaderBar.init', function(ev){
|
||||
// this view has its own ion-header-bar, remember it should trump other nav bars
|
||||
ev.stopPropagation();
|
||||
hasViewHeaderBar = true;
|
||||
});
|
||||
|
||||
|
||||
self.init = function() {
|
||||
deregIonNavBarInit();
|
||||
deregIonHeaderBarInit();
|
||||
|
||||
var modalCtrl = $element.inheritedData('$ionModalController');
|
||||
navViewCtrl = $element.inheritedData('$ionNavViewController');
|
||||
|
||||
1
js/angular/directive/headerFooterBar.js
vendored
1
js/angular/directive/headerFooterBar.js
vendored
@@ -140,7 +140,6 @@ function headerFooterBarDirective(isHeader) {
|
||||
delete $scope.$hasSubheader;
|
||||
});
|
||||
ctrl.align();
|
||||
$scope.$emit('ionHeaderBar.init');
|
||||
|
||||
} else {
|
||||
$scope.$watch(function() { return $element[0].className; }, function(value) {
|
||||
|
||||
@@ -112,12 +112,6 @@ describe('ionView directive', function() {
|
||||
expect( beforeEnterData.navBarDelegate ).toBe('myViewNavBar');
|
||||
}));
|
||||
|
||||
it('should be receive header bar init from child ionHeaderBar', inject(function($rootScope) {
|
||||
var el = setup(null, null, '<ion-header-bar>');
|
||||
$rootScope.$broadcast('$ionicView.beforeEnter', {});
|
||||
expect( beforeEnterData.hasHeaderBar ).toBe(true);
|
||||
}));
|
||||
|
||||
it('should only observe title attr after afterEnter and before beforeLeave', inject(function($rootScope) {
|
||||
var el = setup('view-title="{{ myTitle }}"', {myTitle: 'My Title'});
|
||||
$rootScope.$broadcast('$ionicView.beforeEnter', {});
|
||||
|
||||
Reference in New Issue
Block a user