From 9c7e454e90c60084576870c022a017d1ee447469 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 22 Apr 2015 15:29:58 -0500
Subject: [PATCH] tab bar placement updates

---
 src/components/tabs/extensions/ios.scss |  6 +++---
 src/components/tabs/tabs.js             | 23 +++++------------------
 src/components/tabs/tabs.scss           |  4 ++--
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/components/tabs/extensions/ios.scss b/src/components/tabs/extensions/ios.scss
index c3239a9a16..a74660b136 100644
--- a/src/components/tabs/extensions/ios.scss
+++ b/src/components/tabs/extensions/ios.scss
@@ -27,15 +27,15 @@ $tab-bar-ios-item-icon-size:           2.8rem !default;
     font-size: $tab-bar-ios-item-icon-size;
   }
 
-  &.tab-bar-bottom > .tab-bar-container {
+  &[tab-bar-placement="bottom"] > .tab-bar-container {
     @include hairline(top, $toolbar-ios-border-color);
   }
 
-  &.tab-bar-top > .tab-bar-container {
+  &[tab-bar-placement="top"] > .tab-bar-container {
     @include hairline(bottom, $toolbar-ios-border-color);
   }
 
-  &.tab-bar-top > .toolbar-container .toolbar {
+  &[tab-bar-placement="top"] > .toolbar-container .toolbar {
     @include hairline(bottom, none);
   }
 
diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js
index 4bde8a4452..80f037a46f 100644
--- a/src/components/tabs/tabs.js
+++ b/src/components/tabs/tabs.js
@@ -1,10 +1,10 @@
-import {NgElement, Component, Template, For} from 'angular2/angular2'
+import {NgElement, Component, Template, For, PropertySetter} from 'angular2/angular2'
 import {IonicComponent} from 'ionic2/config/component'
 
 @Component({
   selector: 'ion-tabs',
   bind: {
-    placement: 'placement',
+    tabBarPlacement: 'tab-bar-placement',
     tabBarIcons: 'tab-bar-icons',
     tabBarText: 'tab-bar-text'
   }
@@ -18,7 +18,7 @@ import {IonicComponent} from 'ionic2/config/component'
 
     <nav class="tab-bar-container"
          role="tablist"
-         [attr.aria-activedescendant]="'tab-content-' + selectedTab.tabId">
+         [attr.aria-activedescendant]="'tab-item-' + selectedTab.tabId">
       <div class="tab-bar">
         <button *for="#tab of tabs"
           role="tab"
@@ -48,19 +48,6 @@ export class Tabs  {
   ) {
     this.domElement = ngElement.domElement
 
-    // should be used to cover up sibling .nav-pane's and it's parent
-    this.domElement.classList.add('nav-pane-cover-parent')
-
-    // .tab-bar-top/bottom should be added to the entire element when specified
-    // TODO: MAKE MORE GOOD!!!
-    setTimeout(() => {
-      if (this.placement == 'top') {
-        this.domElement.classList.add('tab-bar-top')
-      } else {
-        this.domElement.classList.add('tab-bar-bottom')
-      }
-    })
-
     this.config = Tabs.config.invoke(this)
     this.tabs = []
   }
@@ -93,14 +80,14 @@ export class Tabs  {
 
 new IonicComponent(Tabs, {
   bind: {
-    placement: {
+    'tab-bar-placement': {
       defaults: {
         ios: 'bottom',
         android: 'top',
         core: 'bottom'
       }
     },
-    tabBarIcons: {
+    'tab-bar-icons': {
       defaults: {
         ios: 'top',
         android: 'none',
diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
index 2c8d92d8c2..24dc4cd7a1 100644
--- a/src/components/tabs/tabs.scss
+++ b/src/components/tabs/tabs.scss
@@ -16,11 +16,11 @@ $tab-bar-item-max-width:           160px !default;
   height: 100%;
 }
 
-.tab-bar-top > .tab-bar-container {
+[tab-bar-placement="top"] > .tab-bar-container {
   @include flex-order($flex-order-tab-bar-top);
 }
 
-.tab-bar-bottom > .tab-bar-container {
+[tab-bar-placement="bottom"] > .tab-bar-container {
   @include flex-order($flex-order-tab-bar-bottom);
 }