From b3d1cc04ded74baeba3f09acb9b1a5a9ffd714c0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 14 Nov 2014 16:09:31 -0600
Subject: [PATCH] fix(headerBar): view header bars stay under nav bars

---
 js/angular/controller/navBarController.js | 5 -----
 js/angular/controller/viewController.js   | 7 -------
 js/angular/directive/headerFooterBar.js   | 1 -
 test/unit/angular/directive/view.unit.js  | 6 ------
 4 files changed, 19 deletions(-)

diff --git a/js/angular/controller/navBarController.js b/js/angular/controller/navBarController.js
index 71fd2a1254..59a80d6ad4 100644
--- a/js/angular/controller/navBarController.js
+++ b/js/angular/controller/navBarController.js
@@ -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);
diff --git a/js/angular/controller/viewController.js b/js/angular/controller/viewController.js
index 076e061df5..28e486e36b 100644
--- a/js/angular/controller/viewController.js
+++ b/js/angular/controller/viewController.js
@@ -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');
diff --git a/js/angular/directive/headerFooterBar.js b/js/angular/directive/headerFooterBar.js
index 2db0f6e5d7..fe50adb9c2 100644
--- a/js/angular/directive/headerFooterBar.js
+++ b/js/angular/directive/headerFooterBar.js
@@ -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) {
diff --git a/test/unit/angular/directive/view.unit.js b/test/unit/angular/directive/view.unit.js
index 5c4e53e0fd..1f32d21aca 100644
--- a/test/unit/angular/directive/view.unit.js
+++ b/test/unit/angular/directive/view.unit.js
@@ -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', {});