feat(header): remove bottom border when tabs top

ionic-team · Mar 4, 2015 · f656672 · f656672
1 parent 71f788e
commit f656672
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/js/angular/controller/navBarController.js b/js/angular/controller/navBarController.js
@@ -410,6 +410,11 @@ function($scope, $element, $attrs, $compile, $timeout, $ionicNavBarDelegate, $io
   };
 
 
+  self.hasTabsTop = function(isTabsTop) {
+    $element[isTabsTop ? 'addClass' : 'removeClass']('nav-bar-tabs-top');
+  };
+
+
   // DEPRECATED, as of v1.0.0-beta14 -------
   self.changeTitle = function(val) {
     deprecatedWarning('changeTitle(val)', 'title(val)');

diff --git a/js/angular/controller/navViewController.js b/js/angular/controller/navViewController.js
@@ -55,6 +55,7 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
     });
 
     $scope.$on('$ionicHistory.deselect', self.cacheCleanup);
+    $scope.$on('$ionicTabs.top', onTabsTop);
 
     ionic.Platform.ready(function() {
       if (ionic.Platform.isWebView() && $ionicConfig.views.swipeBackEnabled()) {
@@ -426,6 +427,12 @@ function($scope, $element, $attrs, $compile, $controller, $ionicNavBarDelegate,
   }
 
 
+  function onTabsTop(ev, isTabsTop) {
+    var associatedNavBarCtrl = getAssociatedNavBarCtrl();
+    associatedNavBarCtrl && associatedNavBarCtrl.hasTabsTop(isTabsTop);
+  }
+
+
   function getAssociatedNavBarCtrl() {
     if (navBarDelegate) {
       for (var x=0; x < $ionicNavBarDelegate._instances.length; x++) {

diff --git a/js/angular/directive/tabs.js b/js/angular/directive/tabs.js
@@ -80,6 +80,7 @@ function($ionicTabsDelegate, $ionicConfig, $ionicHistory) {
           var isHidden = value.indexOf('tabs-item-hide') !== -1;
           $scope.$hasTabs = !isTabsTop && !isHidden;
           $scope.$hasTabsTop = isTabsTop && !isHidden;
+          $scope.$emit('$ionicTabs.top', $scope.$hasTabsTop);
         });
 
         function emitLifecycleEvent(ev, data) {

diff --git a/scss/_bar.scss b/scss/_bar.scss
@@ -393,3 +393,8 @@
 .bar .buttons .hide {
   display: none;
 }
+
+.nav-bar-tabs-top .bar {
+  background-image: none;
+}
+