From fa499e00c89ba127893aa3b876cc47ca22912fdc Mon Sep 17 00:00:00 2001
From: Max Lynch <ihasmax@gmail.com>
Date: Thu, 8 Oct 2015 16:34:50 -0500
Subject: [PATCH 01/15] fix(item-group-title): no content required

---
 ionic/components/item/item-group.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ionic/components/item/item-group.ts b/ionic/components/item/item-group.ts
index 010c49c8f5..29213a26dd 100644
--- a/ionic/components/item/item-group.ts
+++ b/ionic/components/item/item-group.ts
@@ -38,7 +38,7 @@ export class ItemGroupTitle {
    * TODO
    * @param {ElementRef} elementRef  TODO
    */
-  constructor(elementRef: ElementRef, config: IonicConfig, @Host() content: Content) {
+  constructor(elementRef: ElementRef, config: IonicConfig, @Optional() @Host() content: Content) {
     this.isSticky = true;
     this.content = content;
     this.ele = elementRef.nativeElement;
@@ -46,6 +46,7 @@ export class ItemGroupTitle {
   }
 
   onInit() {
+    if(!this.content) { return; }
 
     this.scrollContent = this.content.elementRef.nativeElement.children[0];
 

From 0ef061c2328306ce333a50ef26e2d1e13b3965b5 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Oct 2015 20:08:15 -0500
Subject: [PATCH 02/15] feat(focusOut): ability to blur focused element, close
 keyboard

---
 ionic/components/form/form.scss           | 24 +++---
 ionic/components/form/form.ts             | 89 +++++++++++++----------
 ionic/components/text-input/text-input.ts |  2 -
 3 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/ionic/components/form/form.scss b/ionic/components/form/form.scss
index 6d63dae9a6..03d613739d 100644
--- a/ionic/components/form/form.scss
+++ b/ionic/components/form/form.scss
@@ -66,27 +66,33 @@ select[readonly] {
 // Focus Utils
 // -------------------------------
 
-focus-holder input {
+focus-ctrl {
   position: fixed;
-  top: 1px;
-  width: 9px;
-  left: -9999px;
-  z-index: 9999;
+
+  input,
+  button {
+    position: fixed;
+    top: 1px;
+    width: 9px;
+    left: -9999px;
+    z-index: 9999;
+  }
 }
 
-/*focus-holder input[tabindex="999"] {
+
+/*focus-ctrl input[tabindex="999"] {
   left: 0px;
 }
 
-focus-holder input[tabindex="1001"] {
+focus-ctrl input[tabindex="1001"] {
   left: 20px;
 }
 
-focus-holder input[tabindex="1002"] {
+focus-ctrl input[tabindex="1002"] {
   left: auto;
   right: 10px;
 }
 
-focus-holder input:focus {
+focus-ctrl input:focus {
   background: red;
 }*/
diff --git a/ionic/components/form/form.ts b/ionic/components/form/form.ts
index 98f6ff648c..ce0c856933 100644
--- a/ionic/components/form/form.ts
+++ b/ionic/components/form/form.ts
@@ -28,9 +28,7 @@ export class IonicForm {
     this._focused = null;
 
     zone.runOutsideAngular(() => {
-      if (this._config.get('keyboardScrollAssist')) {
-        this.initHolders(document);
-      }
+      this.initHolders(document, this._config.get('keyboardScrollAssist'));
 
       if (this._config.get('keyboardInputListener') !== false) {
         this.initKeyInput(document);
@@ -78,55 +76,72 @@ export class IonicForm {
     document.addEventListener('keydown', keyDown);
   }
 
-  initHolders(document) {
+  initHolders(document, scrollAssist) {
     // raw DOM fun
-    this._holder = document.createElement('focus-holder');
+    this._ctrl = document.createElement('focus-ctrl');
+    this._ctrl.setAttribute('aria-hidden', true);
 
-    this._prev = document.createElement('input');
-    this._prev.tabIndex = NO_FOCUS_TAB_INDEX;
-    this._holder.appendChild(this._prev);
+    if (scrollAssist) {
+      this._prev = document.createElement('input');
+      this._prev.tabIndex = NO_FOCUS_TAB_INDEX;
+      this._ctrl.appendChild(this._prev);
 
-    this._next = document.createElement('input');
-    this._next.tabIndex = NO_FOCUS_TAB_INDEX;
-    this._holder.appendChild(this._next);
+      this._next = document.createElement('input');
+      this._next.tabIndex = NO_FOCUS_TAB_INDEX;
+      this._ctrl.appendChild(this._next);
 
-    this._temp = document.createElement('input');
-    this._temp.tabIndex = NO_FOCUS_TAB_INDEX;
-    this._holder.appendChild(this._temp);
+      this._temp = document.createElement('input');
+      this._temp.tabIndex = NO_FOCUS_TAB_INDEX;
+      this._ctrl.appendChild(this._temp);
+    }
 
-    document.body.appendChild(this._holder);
+    this._blur = document.createElement('button');
+    this._blur.tabIndex = NO_FOCUS_TAB_INDEX;
+    this._ctrl.appendChild(this._blur);
+
+    document.body.appendChild(this._ctrl);
 
     function preventDefault(ev) {
       ev.preventDefault();
       ev.stopPropagation();
     }
 
-    this._prev.addEventListener('keydown', preventDefault);
-    this._next.addEventListener('keydown', preventDefault);
-    this._temp.addEventListener('keydown', preventDefault);
+    if (scrollAssist) {
+      this._prev.addEventListener('keydown', preventDefault);
+      this._next.addEventListener('keydown', preventDefault);
+      this._temp.addEventListener('keydown', preventDefault);
 
-    this._prev.addEventListener('focus', () => {
-      this.focusPrevious();
-    });
+      this._prev.addEventListener('focus', () => {
+        this.focusPrevious();
+      });
 
-    this._next.addEventListener('focus', () => {
-      this.focusNext();
-    });
+      this._next.addEventListener('focus', () => {
+        this.focusNext();
+      });
 
-    let self = this;
-    let resetTimer;
-    function queueReset() {
-      clearTimeout(resetTimer);
+      let self = this;
+      let resetTimer;
+      function queueReset() {
+        clearTimeout(resetTimer);
 
-      resetTimer = setTimeout(function() {
-        self._zone.run(() => {
-          self.resetInputs();
-        });
-      }, 100);
+        resetTimer = setTimeout(function() {
+          self._zone.run(() => {
+            self.resetInputs();
+          });
+        }, 100);
+      }
+
+      document.addEventListener('focusin', queueReset);
+      document.addEventListener('focusout', queueReset);
     }
 
-    document.addEventListener('focusin', queueReset);
-    document.addEventListener('focusout', queueReset);
+  }
+
+  focusOut() {
+    console.debug('focusOut')
+    this._blur.tabIndex = NORMAL_FOCUS_TAB_INDEX;
+    this._blur.focus();
+    this._blur.tabIndex = NO_FOCUS_TAB_INDEX;
   }
 
   setFocusHolder(type) {
@@ -216,8 +231,7 @@ export class IonicForm {
       if (index > -1 && (index + inc) < this._inputs.length) {
         let siblingInput = this._inputs[index + inc];
         if (siblingInput) {
-          siblingInput.initFocus();
-          return;
+          return siblingInput.initFocus();
         }
       }
       this._focused.initFocus();
@@ -232,4 +246,3 @@ const PREV_TAB_INDEX = 999;
 const ACTIVE_FOCUS_TAB_INDEX = 1000;
 const NEXT_TAB_INDEX = 1001;
 const TEMP_TAB_INDEX = 2000;
-
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index 343552f943..b8b3cdebca 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -322,8 +322,6 @@ export class TextInput {
 
       // ensure the body hasn't scrolled down
       document.body.scrollTop = 0;
-
-      this.form.resetInputs();
     });
 
     if (this.scrollAssist && this.scrollView) {

From 79185044f39ff4e593f3dce49e24fc6f8af45cec Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 8 Oct 2015 19:17:50 -0500
Subject: [PATCH 03/15] make some NavController methods private

---
 ionic/components/nav/nav-controller.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index d1e6d52343..cfa26f9497 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -188,7 +188,7 @@ export class NavController extends Ion {
     let enteringView = new ViewController(this, componentType, params);
 
     // add the view to the stack
-    this.add(enteringView);
+    this._add(enteringView);
 
     if (this.router) {
       // notify router of the state change
@@ -253,12 +253,13 @@ export class NavController extends Ion {
   }
 
   /**
+   * @private
    * Pop to a specific view in the history stack
    *
-   * @param view {Component} to pop to
+   * @param view {ViewController} to pop to
    * @param opts {object} pop options
    */
-  popTo(view, opts = {}) {
+  _popTo(view, opts = {}) {
 
     // Get the target index of the view to pop to
     let viewIndex = this._views.indexOf(view);
@@ -383,7 +384,7 @@ export class NavController extends Ion {
           viewCtrl.shouldCache = false;
 
           // add the item to the stack
-          this.add(viewCtrl);
+          this._add(viewCtrl);
         }
       }
     }
@@ -749,7 +750,7 @@ export class NavController extends Ion {
     });
 
     destroys.forEach(view => {
-      this.remove(view);
+      this._remove(view);
       view.destroy();
     });
 
@@ -873,11 +874,12 @@ export class NavController extends Ion {
   }
 
   /**
+   * @private
    * TODO
    * @param {TODO} view  TODO
    * @returns {TODO} TODO
    */
-  add(view) {
+  _add(view) {
     this._incrementId(view);
     this._views.push(view);
   }
@@ -887,11 +889,12 @@ export class NavController extends Ion {
   }
 
   /**
+   * @private
    * TODO
    * @param {TODO} viewOrIndex  TODO
    * @returns {TODO} TODO
    */
-  remove(viewOrIndex) {
+  _remove(viewOrIndex) {
     util.array.remove(this._views, viewOrIndex);
   }
 

From f199e65767a056f78e3a424acfd94c8c9c7fa1b5 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 8 Oct 2015 19:20:52 -0500
Subject: [PATCH 04/15] fix(nav-controller): insert should return a promise

---
 ionic/components/nav/nav-controller.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index cfa26f9497..05baab9aa9 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -332,6 +332,7 @@ export class NavController extends Ion {
 
     this._incrementId(viewCtrl);
     this._views.splice(index, 0, viewCtrl);
+    return Promise.resolve();
   }
 
   /**

From 7ccdfed018d3c8695ab3637845dba4bec20e5b89 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 8 Oct 2015 20:42:24 -0500
Subject: [PATCH 05/15] feat(nav-controller): remove method

---
 ionic/components/nav/nav-controller.ts   | 20 ++++++++++++++++++++
 ionic/components/nav/nav.ts              |  4 +---
 ionic/components/nav/test/basic/index.ts |  5 +++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 05baab9aa9..91edc2d10e 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -335,6 +335,26 @@ export class NavController extends Ion {
     return Promise.resolve();
   }
 
+  /**
+   * Removes a view from the nav stack at the specified index.
+   * @param {TODO} index TODO
+   * @returns {Promise} TODO
+   */
+  remove(index) {
+    if (index < 0 || index >= this._views.length) {
+      return Promise.reject("Index out of range");
+    }
+
+    let viewToRemove = this._views[index];
+    if (this.isActive(viewToRemove)){
+      return this.pop();
+    } else {
+      this._remove(index);
+      viewToRemove.destroy();
+      return Promise.resolve();
+    }
+  }
+
   /**
    * Set the view stack to reflect the given component classes.
    * @param {TODO} components  TODO
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index 5aa2b388a9..ffc10b4000 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -437,9 +437,7 @@ class Pane {
 
   showNavbar(hasNavbar) {
     this.navbar = hasNavbar;
-    if (!hasNavbar) {
-      this.renderer.setElementAttribute(this.elementRef, 'no-navbar', '');
-    }
+    this.renderer.setElementAttribute(this.elementRef, 'no-navbar', hasNavbar ? null : '' );
   }
 
 }
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index 3f6ead453f..d20838f9bf 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -104,6 +104,7 @@ class SecondPage {
       <p>
         <button id="from3To2" (click)="pop()">Pop (Go back to 2nd)</button>
         <button id="insert" (click)="insert()">Insert first page into history before this</button>
+        <button id="remove" (click)="removeSecond()">Remove second page in history</button>
       </p>
       <div class="yellow"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
     </ion-content>
@@ -124,6 +125,10 @@ class ThirdPage {
     this.nav.insert(FirstPage, 2);
   }
 
+  removeSecond() {
+    this.nav.remove(1);
+  }
+
 }
 
 

From 18519d1576482f3907d0afdccd408da43ea17ecf Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Oct 2015 21:32:14 -0500
Subject: [PATCH 06/15] refactor(cssClass): update/cleanup css class usage

---
 demos/yerk/main.html                        |  4 +--
 ionic/components/button/button.ts           | 11 +++----
 ionic/components/checkbox/checkbox.ts       |  8 +++--
 ionic/components/item/item-sliding.ts       | 11 +++----
 ionic/components/item/modes/md.scss         |  2 +-
 ionic/components/list/list.ts               | 10 +++---
 ionic/components/nav-bar/modes/ios.scss     |  2 +-
 ionic/components/nav-bar/modes/md.scss      | 34 +++++++++------------
 ionic/components/nav-bar/nav-bar.ts         | 11 +++----
 ionic/components/nav/nav.ts                 |  7 ++---
 ionic/components/radio/radio.ts             | 14 ++++++---
 ionic/components/search-bar/modes/ios.scss  |  4 +--
 ionic/components/search-bar/modes/md.scss   |  2 +-
 ionic/components/search-bar/search-bar.scss |  2 +-
 ionic/components/switch/switch.ts           |  5 ++-
 ionic/components/tabs/tabs.ts               |  2 +-
 ionic/components/text-input/label.scss      |  2 +-
 ionic/components/text-input/label.ts        |  1 -
 ionic/components/text-input/modes/ios.scss  |  8 ++---
 ionic/components/text-input/modes/md.scss   |  8 ++---
 ionic/components/text-input/text-input.scss |  4 +--
 ionic/components/text-input/text-input.ts   | 23 +++++++++-----
 ionic/components/toolbar/toolbar.ts         | 11 +++----
 ionic/config/decorators.ts                  |  3 --
 scripts/snapshot/snapshot.config.js         |  2 +-
 25 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/demos/yerk/main.html b/demos/yerk/main.html
index 59e85c1e73..47ea1ee8af 100644
--- a/demos/yerk/main.html
+++ b/demos/yerk/main.html
@@ -1,10 +1,10 @@
 <ion-nav [root]="root"></ion-nav>
 
 <style>
-  .md .nav .navbar-container {
+  .md .navbar-container {
     background-color: #2FD9BB !important;
   }
-  .md .nav .navbar-title {
+  .md .navbar-title {
     color: #FDFEFE;
   }
   #tabs tab-bar:before {
diff --git a/ionic/components/button/button.ts b/ionic/components/button/button.ts
index b0d45f3004..346c6f0546 100644
--- a/ionic/components/button/button.ts
+++ b/ionic/components/button/button.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Renderer} from 'angular2/angular2';
+import {Directive, ElementRef, Renderer, Attribute} from 'angular2/angular2';
 
 import {IonicConfig} from '../../config/config';
 
@@ -14,7 +14,8 @@ export class Button {
   constructor(
     config: IonicConfig,
     elementRef: ElementRef,
-    renderer: Renderer
+    renderer: Renderer,
+    @Attribute('type') type: string
   ) {
     let element = elementRef.nativeElement;
 
@@ -22,10 +23,8 @@ export class Button {
       element.classList.add('disable-hover');
     }
 
-    // TODO this isn't working in the popup
-    if (element.hasAttribute('type')) {
-      let type = element.getAttribute("type");
-      renderer.setElementAttribute(elementRef, type, "");
+    if (type) {
+      renderer.setElementAttribute(elementRef, type, '');
     }
 
     if (element.hasAttribute('ion-item')) {
diff --git a/ionic/components/checkbox/checkbox.ts b/ionic/components/checkbox/checkbox.ts
index de763f43de..c39e87d05e 100644
--- a/ionic/components/checkbox/checkbox.ts
+++ b/ionic/components/checkbox/checkbox.ts
@@ -1,4 +1,4 @@
-import {Component, View, Directive, Optional, NgControl} from 'angular2/angular2';
+import {Component, View, Directive, Optional, NgControl, ElementRef, Renderer} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {IonicForm} from '../form/form';
@@ -24,7 +24,6 @@ import {IonicForm} from '../form/form';
     'id'
   ],
   host: {
-    'class': 'item',
     'role': 'checkbox',
     'tappable': 'true',
     '[attr.tab-index]': 'tabIndex',
@@ -47,8 +46,11 @@ export class Checkbox {
 
   constructor(
     form: IonicForm,
-    @Optional() ngControl: NgControl
+    @Optional() ngControl: NgControl,
+    elementRef: ElementRef,
+    renderer: Renderer
   ) {
+    renderer.setElementClass(elementRef, 'item', true);
     this.form = form;
     form.register(this);
 
diff --git a/ionic/components/item/item-sliding.ts b/ionic/components/item/item-sliding.ts
index 98771c4938..1452bbad6f 100644
--- a/ionic/components/item/item-sliding.ts
+++ b/ionic/components/item/item-sliding.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, View, ElementRef, NgIf, Host, Optional} from 'angular2/angular2';
+import {Component, Directive, View, ElementRef, NgIf, Host, Optional, Renderer} from 'angular2/angular2';
 
 import {Gesture} from 'ionic/gestures/gesture';
 import {DragGesture} from 'ionic/gestures/drag-gesture';
@@ -30,10 +30,7 @@ import {CSS, raf} from 'ionic/util/dom';
  */
 @Component({
   selector: 'ion-item-sliding,[ion-item-sliding]',
-  host: {
-    'class': 'item'
-  },
-  properties: [
+  inputs: [
     'sliding'
   ]
 })
@@ -53,7 +50,9 @@ export class ItemSliding {
    * TODO
    * @param {ElementRef} elementRef  A reference to the component's DOM element.
    */
-  constructor(elementRef: ElementRef, @Optional() @Host() list: List) {
+  constructor(elementRef: ElementRef, renderer: Renderer, @Optional() @Host() list: List) {
+    renderer.setElementClass(elementRef, 'item', true);
+
     this._isOpen = false;
     this._isSlideActive = false;
     this._isTransitioning = false;
diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index 345eb45184..35e9388bf4 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -149,7 +149,7 @@ $item-md-sliding-transition:         transform 250ms ease-in-out !default;
   }
 
   icon[item-left] + ion-item-content,
-  icon[item-left] + .text-input {
+  icon[item-left] + [text-input] {
     margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
   }
 
diff --git a/ionic/components/list/list.ts b/ionic/components/list/list.ts
index 14d2a8b72c..b495f7e9a1 100644
--- a/ionic/components/list/list.ts
+++ b/ionic/components/list/list.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef} from 'angular2/angular2';
+import {Directive, ElementRef, Renderer} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';
@@ -22,10 +22,7 @@ import * as util from 'ionic/util';
     'items',
     'virtual',
     'content'
-  ],
-  host: {
-    'class': 'list'
-  }
+  ]
 })
 export class List extends Ion {
   /**
@@ -33,8 +30,9 @@ export class List extends Ion {
    * @param {ElementRef} elementRef  TODO
    * @param {IonicConfig} config  TODO
    */
-  constructor(elementRef: ElementRef, config: IonicConfig) {
+  constructor(elementRef: ElementRef, config: IonicConfig, renderer: Renderer) {
     super(elementRef, config);
+    renderer.setElementClass(elementRef, 'list', true);
     this.ele = elementRef.nativeElement;
   }
   /**
diff --git a/ionic/components/nav-bar/modes/ios.scss b/ionic/components/nav-bar/modes/ios.scss
index 06c00aec01..8bc6070550 100644
--- a/ionic/components/nav-bar/modes/ios.scss
+++ b/ionic/components/nav-bar/modes/ios.scss
@@ -5,6 +5,6 @@
 $navbar-ios-height:                        4.4rem !default;
 
 
-.nav .navbar-container {
+.navbar-container {
   min-height: $navbar-ios-height;
 }
diff --git a/ionic/components/nav-bar/modes/md.scss b/ionic/components/nav-bar/modes/md.scss
index a19dbfcc3f..28f0d1156a 100644
--- a/ionic/components/nav-bar/modes/md.scss
+++ b/ionic/components/nav-bar/modes/md.scss
@@ -5,23 +5,19 @@
 $navbar-md-height:                  5.6rem !default;
 
 
-.nav {
-
-  .navbar-container {
-    min-height: $navbar-md-height;
-  }
-
-  .back-button {
-    margin: 0 0 0 12px;
-    box-shadow: none;
-  }
-
-  .back-button-icon {
-    margin: 0;
-    min-width: 44px;
-    font-size: 2.4rem;
-    font-weight: normal;
-    text-align: left;
-  }
-
+.navbar-container {
+  min-height: $navbar-md-height;
+}
+
+.toolbar .back-button {
+  margin: 0 0 0 12px;
+  box-shadow: none;
+}
+
+.toolbar .back-button-icon {
+  margin: 0;
+  min-width: 44px;
+  font-size: 2.4rem;
+  font-weight: normal;
+  text-align: left;
 }
diff --git a/ionic/components/nav-bar/nav-bar.ts b/ionic/components/nav-bar/nav-bar.ts
index f4a6e13117..d6884024c4 100644
--- a/ionic/components/nav-bar/nav-bar.ts
+++ b/ionic/components/nav-bar/nav-bar.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, View, Optional, ElementRef, TemplateRef, forwardRef, Inject} from 'angular2/angular2';
+import {Component, Directive, View, Optional, ElementRef, Renderer, TemplateRef, forwardRef, Inject} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {Icon} from '../icon/icon';
@@ -50,10 +50,7 @@ class BackButtonText extends Ion {
 
 
 @Component({
-  selector: 'ion-navbar',
-  host: {
-    'class': 'toolbar'
-  }
+  selector: 'ion-navbar'
 })
 @View({
   template:
@@ -77,9 +74,11 @@ export class Navbar extends ToolbarBase {
     app: IonicApp,
     @Optional() viewCtrl: ViewController,
     elementRef: ElementRef,
-    config: IonicConfig
+    config: IonicConfig,
+    renderer: Renderer
   ) {
     super(elementRef, config);
+    renderer.setElementClass(elementRef, 'toolbar', true);
 
     this.app = app;
     viewCtrl && viewCtrl.navbarView(this);
diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts
index ffc10b4000..04d045e61a 100644
--- a/ionic/components/nav/nav.ts
+++ b/ionic/components/nav/nav.ts
@@ -405,13 +405,10 @@ class ContentAnchor {
  * @private
  */
 @Component({
-  selector: 'ion-pane',
-  host: {
-    'class': 'nav'
-  }
+  selector: 'ion-pane'
 })
 @View({
-  template: '' +
+  template:
     '<section class="navbar-container">' +
       '<template navbar-anchor></template>' +
     '</section>' +
diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts
index dcdebc3a05..64b8aae3df 100644
--- a/ionic/components/radio/radio.ts
+++ b/ionic/components/radio/radio.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, ElementRef, Host, Optional, NgControl, Query, QueryList, View} from 'angular2/angular2';
+import {Component, Directive, ElementRef, Renderer, Host, Optional, NgControl, Query, QueryList, View} from 'angular2/angular2';
 
 import {IonicConfig} from '../../config/config';
 import {Ion} from '../ion';
@@ -45,7 +45,6 @@ import {ListHeader} from '../list/list';
 @Directive({
   selector: 'ion-radio-group',
   host: {
-    'class': 'list',
     'role': 'radiogroup',
     '[attr.aria-activedescendant]': 'activeId',
     '[attr.aria-describedby]': 'describedById'
@@ -64,10 +63,13 @@ export class RadioGroup extends Ion {
   constructor(
     elementRef: ElementRef,
     config: IonicConfig,
+    renderer: Renderer,
     @Optional() ngControl: NgControl,
     @Query(ListHeader) private headerQuery: QueryList<ListHeader>
   ) {
     super(elementRef, config);
+    renderer.setElementClass(elementRef, 'list', true);
+
     this.id = ++radioGroupIds;
     this.radioIds = -1;
     this.onChange = (_) => {};
@@ -170,7 +172,6 @@ export class RadioGroup extends Ion {
     'id'
   ],
   host: {
-    'class': 'item',
     'role': 'radio',
     'tappable': 'true',
     '[attr.id]': 'id',
@@ -200,9 +201,12 @@ export class RadioButton extends Ion {
   constructor(
     @Host() @Optional() group: RadioGroup,
     elementRef: ElementRef,
-    config: IonicConfig
+    config: IonicConfig,
+    renderer: Renderer
   ) {
-    super(elementRef, config)
+    super(elementRef, config);
+    renderer.setElementClass(elementRef, 'item', true);
+
     this.group = group;
     this.tabIndex = 0;
   }
diff --git a/ionic/components/search-bar/modes/ios.scss b/ionic/components/search-bar/modes/ios.scss
index c7f9d10922..6597054cfc 100644
--- a/ionic/components/search-bar/modes/ios.scss
+++ b/ionic/components/search-bar/modes/ios.scss
@@ -23,7 +23,7 @@ $search-bar-ios-input-close-icon-svg:     "<svg xmlns='http://www.w3.org/2000/sv
 $search-bar-ios-input-close-icon-size:    17px !default;
 
 
-.search-bar {
+ion-search-bar {
   padding: $search-bar-ios-padding;
   background: $search-bar-ios-background-color;
   border-bottom: 1px solid $search-bar-ios-border-color;
@@ -95,6 +95,6 @@ $search-bar-ios-input-close-icon-size:    17px !default;
   padding-right: 0;
 }
 
-&.hairlines .search-bar {
+&.hairlines ion-search-bar {
   border-bottom-width: 0.55px;
 }
diff --git a/ionic/components/search-bar/modes/md.scss b/ionic/components/search-bar/modes/md.scss
index 84a1c244bd..91051e4bc2 100644
--- a/ionic/components/search-bar/modes/md.scss
+++ b/ionic/components/search-bar/modes/md.scss
@@ -21,7 +21,7 @@ $search-bar-md-input-close-icon-svg:     "<svg xmlns='http://www.w3.org/2000/svg
 $search-bar-md-input-close-icon-size:    22px !default;
 
 
-.search-bar {
+ion-search-bar {
   padding: $search-bar-md-padding;
   background: $search-bar-md-background-color;
 }
diff --git a/ionic/components/search-bar/search-bar.scss b/ionic/components/search-bar/search-bar.scss
index 2d719af7e0..b3e64243c6 100644
--- a/ionic/components/search-bar/search-bar.scss
+++ b/ionic/components/search-bar/search-bar.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 
-.search-bar {
+ion-search-bar {
   position: relative;
   display: flex;
   align-items: center;
diff --git a/ionic/components/switch/switch.ts b/ionic/components/switch/switch.ts
index a5da0d74cf..0ce57e66d7 100644
--- a/ionic/components/switch/switch.ts
+++ b/ionic/components/switch/switch.ts
@@ -3,6 +3,7 @@ import {
   View,
   Directive,
   ElementRef,
+  Renderer,
   Host,
   Optional,
   NgControl,
@@ -84,7 +85,6 @@ class MediaSwitch {
     'id'
   ],
   host: {
-    'class': 'item',
     'role': 'checkbox',
     'tappable': 'true',
     '[attr.tab-index]': 'tabIndex',
@@ -119,11 +119,14 @@ export class Switch {
     form: IonicForm,
     elementRef: ElementRef,
     config: IonicConfig,
+    renderer: Renderer,
     @Optional() private ngControl: NgControl
   ) {
     this.form = form;
     form.register(this);
 
+    renderer.setElementClass(elementRef, 'item', true);
+
     this.lastTouch = 0;
     this.mode = config.get('mode');
 
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index a0ef26bcf4..1d51a8318d 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -68,7 +68,7 @@ import * as dom from 'ionic/util/dom';
   }
 })
 @View({
-  template: '' +
+  template:
     '<section class="navbar-container">' +
       '<template navbar-anchor></template>' +
     '</section>' +
diff --git a/ionic/components/text-input/label.scss b/ionic/components/text-input/label.scss
index be73c35416..16ee28db71 100644
--- a/ionic/components/text-input/label.scss
+++ b/ionic/components/text-input/label.scss
@@ -32,7 +32,7 @@ ion-input[floating-label] {
     max-width: 100%;
   }
 
-  .text-input {
+  [text-input] {
     align-self: stretch;
     width: auto;
   }
diff --git a/ionic/components/text-input/label.ts b/ionic/components/text-input/label.ts
index 1d8f2a2258..0134388e83 100644
--- a/ionic/components/text-input/label.ts
+++ b/ionic/components/text-input/label.ts
@@ -14,7 +14,6 @@ import {pointerCoord, hasPointerMoved} from '../../util/dom';
   ],
   host: {
     '[attr.id]': 'id',
-    'class': 'input-label',
     '(touchstart)': 'pointerStart($event)',
     '(touchend)': 'pointerEnd($event)',
     '(mousedown)': 'pointerStart($event)',
diff --git a/ionic/components/text-input/modes/ios.scss b/ionic/components/text-input/modes/ios.scss
index a0937abf27..1804b383e1 100644
--- a/ionic/components/text-input/modes/ios.scss
+++ b/ionic/components/text-input/modes/ios.scss
@@ -8,12 +8,12 @@ $input-label-ios-color:         #7f7f7f !default;
 .list,
 ion-card {
 
-  .text-input {
+  [text-input] {
     margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom ($item-ios-padding-left / 2);
     padding: 0;
   }
 
-  ion-input[inset] .text-input {
+  ion-input[inset] [text-input] {
     margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) $item-ios-padding-left;
     padding: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2);
   }
@@ -28,8 +28,8 @@ ion-card {
     margin-bottom: 4px;
   }
 
-  [stacked-label] .text-input,
-  [floating-label] .text-input {
+  [stacked-label] [text-input],
+  [floating-label] [text-input] {
     margin-top: 8px;
     margin-bottom: 8px;
   }
diff --git a/ionic/components/text-input/modes/md.scss b/ionic/components/text-input/modes/md.scss
index 403012248a..42aad570a7 100644
--- a/ionic/components/text-input/modes/md.scss
+++ b/ionic/components/text-input/modes/md.scss
@@ -9,7 +9,7 @@ $input-label-md-color:            #999 !default;
 .list,
 ion-card {
 
-  .text-input {
+  [text-input] {
     margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom ($item-md-padding-left / 2);
     padding: 0;
   }
@@ -19,7 +19,7 @@ ion-card {
     left: 0;
   }
 
-  ion-input[inset] .text-input {
+  ion-input[inset] [text-input] {
     margin: ($item-md-padding-top / 2) $item-md-padding-right ($item-md-padding-bottom / 2) $item-md-padding-left;
     padding: ($item-md-padding-top / 2) ($item-md-padding-right / 2) ($item-md-padding-bottom / 2) ($item-md-padding-left / 2);
   }
@@ -48,8 +48,8 @@ ion-card {
     color: $text-input-highlight-color;
   }
 
-  [stacked-label] .text-input,
-  [floating-label] .text-input {
+  [stacked-label] [text-input],
+  [floating-label] [text-input] {
     margin-bottom: 8px;
     margin-top: 8px;
   }
diff --git a/ionic/components/text-input/text-input.scss b/ionic/components/text-input/text-input.scss
index 32bfcc3c67..550a3d5d91 100644
--- a/ionic/components/text-input/text-input.scss
+++ b/ionic/components/text-input/text-input.scss
@@ -24,13 +24,13 @@ ion-input.item {
   }
 }
 
-ion-input .text-input {
+ion-input [text-input] {
   flex: 1;
   background-color: $text-input-background-color;
   pointer-events: none;
 }
 
-ion-input.has-focus .text-input {
+ion-input.has-focus [text-input] {
   pointer-events: auto;
 }
 
diff --git a/ionic/components/text-input/text-input.ts b/ionic/components/text-input/text-input.ts
index b8b3cdebca..57fc6af1e4 100644
--- a/ionic/components/text-input/text-input.ts
+++ b/ionic/components/text-input/text-input.ts
@@ -1,4 +1,4 @@
-import {Directive, View, Host, Optional, ElementRef, Attribute, Query, QueryList, NgZone} from 'angular2/angular2';
+import {Directive, View, Host, Optional, ElementRef, Renderer, Attribute, Query, QueryList, NgZone} from 'angular2/angular2';
 
 import {IonicConfig} from '../../config/config';
 import {IonicForm} from '../form/form';
@@ -21,8 +21,7 @@ import {IonicPlatform} from '../../platform/platform';
     '(touchend)': 'pointerEnd($event)',
     '(mouseup)': 'pointerEnd($event)',
     '[class.has-focus]': 'hasFocus',
-    '[class.has-value]': 'hasValue',
-    'class': 'item'
+    '[class.has-value]': 'hasValue'
   }
 })
 export class TextInput {
@@ -40,11 +39,14 @@ export class TextInput {
     form: IonicForm,
     elementRef: ElementRef,
     config: IonicConfig,
+    renderer: Renderer,
     app: IonicApp,
     zone: NgZone,
     platform: IonicPlatform,
     @Optional() @Host() scrollView: Content
   ) {
+    renderer.setElementClass(elementRef, 'item', true);
+
     this.form = form;
     form.register(this);
 
@@ -72,7 +74,8 @@ export class TextInput {
    */
   onInit() {
     if (this.input && this.label) {
-      this.input.labelledBy = this.label.id = (this.label.id || 'label-' + this.inputId);
+      this.label.id = (this.label.id || 'label-' + this.inputId)
+      this.input.labelledBy(this.label.id);
     }
 
     let self = this;
@@ -384,9 +387,7 @@ export class TextInput {
     'tabIndex'
   ],
   host: {
-    '[tabIndex]': 'tabIndex',
-    '[attr.aria-labelledby]': 'labelledBy',
-    'class': 'text-input'
+    '[tabIndex]': 'tabIndex'
   }
 })
 export class TextInputElement {
@@ -395,6 +396,7 @@ export class TextInputElement {
     form: IonicForm,
     @Attribute('type') type: string,
     elementRef: ElementRef,
+    renderer: Renderer,
     @Optional() textInputWrapper: TextInput
   ) {
     this.form = form;
@@ -402,6 +404,9 @@ export class TextInputElement {
     this.elementRef = elementRef;
     this.tabIndex = 0;
 
+    this.renderer = renderer;
+    renderer.setElementAttribute(this.elementRef, 'text-input', '');
+
     if (textInputWrapper) {
       // it's within ionic's ion-input, let ion-input handle what's up
       textInputWrapper.registerInput(this);
@@ -412,6 +417,10 @@ export class TextInputElement {
     }
   }
 
+  labelledBy(val) {
+    this.renderer.setElementAttribute(this.elementRef, 'aria-labelledby', val);
+  }
+
   initFocus() {
     this.elementRef.nativeElement.focus();
   }
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index 7adaba5b29..4e236acfe1 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -1,4 +1,4 @@
-import {Component, Directive, View, Host, ElementRef, Optional, forwardRef, Inject} from 'angular2/angular2';
+import {Component, Directive, View, Host, ElementRef, Renderer, Optional, forwardRef, Inject} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';
@@ -56,10 +56,7 @@ export class ToolbarBase extends Ion  {
  * TODO
  */
 @Component({
-  selector: 'ion-toolbar',
-  host: {
-    'class': 'toolbar'
-  }
+  selector: 'ion-toolbar'
 })
 @View({
   template:
@@ -74,9 +71,11 @@ export class ToolbarBase extends Ion  {
 export class Toolbar extends ToolbarBase {
   constructor(
     elementRef: ElementRef,
-    config: IonicConfig
+    config: IonicConfig,
+    renderer: Renderer
   ) {
     super(elementRef, config);
+    renderer.setElementClass(elementRef, 'toolbar', true);
   }
 
 }
diff --git a/ionic/config/decorators.ts b/ionic/config/decorators.ts
index ca23d68d1f..f53652a132 100644
--- a/ionic/config/decorators.ts
+++ b/ionic/config/decorators.ts
@@ -114,9 +114,6 @@ function appendConfig(cls, config) {
 
   cls.delegates = config.delegates;
 
-  let componentId = (config.selector && config.selector.replace('ion-', ''));
-  config.host['class'] = ((config.host['class'] || '') + ' ' + componentId).trim();
-
   return config;
 }
 
diff --git a/scripts/snapshot/snapshot.config.js b/scripts/snapshot/snapshot.config.js
index d3649a0e34..6c177a25c1 100644
--- a/scripts/snapshot/snapshot.config.js
+++ b/scripts/snapshot/snapshot.config.js
@@ -11,7 +11,7 @@ exports.config = {
   specs: 'dist/e2e/**/*e2e.js',
   //specs: 'dist/e2e/tabs/**/*e2e.js',
 
-  sleepBetweenSpecs: 1400,
+  sleepBetweenSpecs: 1000,
 
   platformDefauls: {
     browser: 'chrome',

From f18d114dbe8e7796a65b5d12be57fc02fb26c057 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Oct 2015 21:48:04 -0500
Subject: [PATCH 07/15] test(button): add block button icon e2e

---
 ionic/components/button/button.ts            | 10 +++++-----
 ionic/components/button/test/block/main.html |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ionic/components/button/button.ts b/ionic/components/button/button.ts
index 346c6f0546..9a56fff577 100644
--- a/ionic/components/button/button.ts
+++ b/ionic/components/button/button.ts
@@ -20,11 +20,7 @@ export class Button {
     let element = elementRef.nativeElement;
 
     if (config.get('hoverCSS') === false) {
-      element.classList.add('disable-hover');
-    }
-
-    if (type) {
-      renderer.setElementAttribute(elementRef, type, '');
+      renderer.setElementClass(elementRef, 'disable-hover', true);
     }
 
     if (element.hasAttribute('ion-item')) {
@@ -32,6 +28,10 @@ export class Button {
       return;
     }
 
+    if (type) {
+      renderer.setElementAttribute(elementRef, type, '');
+    }
+
     // figure out if and where the icon lives in the button
     let childNodes = element.childNodes;
     let childNode;
diff --git a/ionic/components/button/test/block/main.html b/ionic/components/button/test/block/main.html
index e440bc75de..b99513a59d 100644
--- a/ionic/components/button/test/block/main.html
+++ b/ionic/components/button/test/block/main.html
@@ -10,6 +10,11 @@
     <button block>button[block]</button>
   </p>
 
+  <p>
+    <a button block href="#"><icon help-circle></icon> a[button][block] icon</a>
+    <button block><icon help-circle></icon> button[block] icon</button>
+  </p>
+
   <p>
     <a button block outline secondary href="#">a[button][block][outline][secondary]</a>
     <button block outline secondary>button[block][outline][secondary]</button>

From b2336550dd1f60bfdd44bdc898546e1f9f199c24 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Oct 2015 21:57:10 -0500
Subject: [PATCH 08/15] chore(): user renderer more for icons

---
 ionic/components/icon/icon.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index aad91b1c89..df89689be9 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -3,9 +3,6 @@ import {Directive, ElementRef, Attribute, Renderer} from 'angular2/angular2';
 import {IonicConfig} from '../../config/config';
 
 
-/**
- * TODO
- */
 @Directive({
   selector: 'icon',
   inputs: [
@@ -15,17 +12,11 @@ import {IonicConfig} from '../../config/config';
     'isActive'
   ],
   host: {
-    '[attr.aria-label]': 'label',
     'role': 'img'
   }
 })
 export class Icon {
-  /**
-   * TODO
-   * @param {ElementRef} elementRef  TODO
-   * @param {IonicConfig} config  TODO
-   * @param {Renderer} renderer  TODO
-   */
+
   constructor(
     private elementRef: ElementRef,
     config: IonicConfig,
@@ -37,9 +28,6 @@ export class Icon {
     this.mode = config.get('iconMode');
   }
 
-  /**
-   * TODO
-   */
   onInit() {
     let ele = this.eleRef.nativeElement;
 
@@ -101,7 +89,8 @@ export class Icon {
       this._name = this.name;
       this.renderer.setElementClass(this.elementRef, this.name, true);
 
-      this.label = this.name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', ' ');
+      this.renderer.setElementAttribute(this.elementRef, 'aria-label',
+          this.name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', ' '));
     }
   }
 

From 63aebf8ba89120f3347977c69130ec1d86cf0410 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 8 Oct 2015 22:56:07 -0500
Subject: [PATCH 09/15] NavController popTo takes componentType

---
 ionic/components/nav/nav-controller.ts   | 30 +++++++++++++++++-------
 ionic/components/nav/test/basic/index.ts |  5 ++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 91edc2d10e..a443ec7194 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -253,16 +253,15 @@ export class NavController extends Ion {
   }
 
   /**
-   * @private
-   * Pop to a specific view in the history stack
+   * Pop to a specific page in the history stack
    *
-   * @param view {ViewController} to pop to
+   * @param componentType the page to pop to
    * @param opts {object} pop options
    */
-  _popTo(view, opts = {}) {
+  popTo(componentType, opts = {}) {
 
     // Get the target index of the view to pop to
-    let viewIndex = this._views.indexOf(view);
+    let viewIndex = this.getIndexByComponentType(componentType);
     let targetIndex = viewIndex + 1;
     let resolve;
     let promise = new Promise(res => { resolve = res; });
@@ -272,7 +271,6 @@ export class NavController extends Ion {
       return;
     }
 
-
     opts.direction = opts.direction || 'back';
 
     // get the views to auto remove without having to do a transiton for each
@@ -287,7 +285,7 @@ export class NavController extends Ion {
     }
 
     let leavingView = this._views[this._views.length - 1];
-    let enteringView = view;
+    let enteringView = this.getByIndex(viewIndex);
 
     if(this.router) {
       this.router.stateChange('pop', enteringView);
@@ -305,7 +303,7 @@ export class NavController extends Ion {
    * @param opts extra animation options
    */
   popToRoot(opts = {}) {
-    this.popTo(this._views[0]);
+    this.popTo(this._views[0].componentType);
   }
 
   /**
@@ -816,6 +814,22 @@ export class NavController extends Ion {
     return null;
   }
 
+  /**
+   * Get the index of the view with the specified componentType
+   * @param  componentType
+   * @return index
+   */
+  getIndexByComponentType(componentType) {
+    if (componentType) {
+      for (let i = 0, ii = this._views.length; i < ii; i++) {
+        if (this._views[i].componentType === componentType) {
+          return i;
+        }
+      }
+    }
+    return null;
+  }
+
   /**
    * TODO
    * @param {TODO} index  TODO
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index d20838f9bf..91df16917d 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -105,6 +105,7 @@ class SecondPage {
         <button id="from3To2" (click)="pop()">Pop (Go back to 2nd)</button>
         <button id="insert" (click)="insert()">Insert first page into history before this</button>
         <button id="remove" (click)="removeSecond()">Remove second page in history</button>
+        <button id="popto" (click)="popTo()">popTo FirstPage</button>
       </p>
       <div class="yellow"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
     </ion-content>
@@ -129,6 +130,10 @@ class ThirdPage {
     this.nav.remove(1);
   }
 
+  popTo() {
+    this.nav.popTo(FirstPage);
+  }
+
 }
 
 

From b0bc9914567c0d48b51fa2a9361249ba6e49bf28 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Thu, 8 Oct 2015 22:58:11 -0500
Subject: [PATCH 10/15] fix navcontroller tests

---
 ionic/components/nav/test/nav-controller.spec.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ionic/components/nav/test/nav-controller.spec.ts b/ionic/components/nav/test/nav-controller.spec.ts
index cfcafec3c3..5c9469b123 100644
--- a/ionic/components/nav/test/nav-controller.spec.ts
+++ b/ionic/components/nav/test/nav-controller.spec.ts
@@ -46,7 +46,7 @@ export function run() {
       });
 
       destroys.forEach(view => {
-        nav.remove(view);
+        nav._remove(view);
         view.destroy();
       });
       cb();
@@ -75,7 +75,7 @@ export function run() {
         let activeView = new ViewController();
         activeView.state = 1; // ACTIVE_STATE
 
-        nav.add(activeView);
+        nav._add(activeView);
         var active = nav.getActive();
 
         expect(active).toBe(activeView);
@@ -83,7 +83,7 @@ export function run() {
         let secondActiveView = new ViewController();
         secondActiveView.state = 1; // ACTIVE_STATE
 
-        nav.add(secondActiveView);
+        nav._add(secondActiveView);
         active = nav.getActive();
 
         expect(active).toBe(activeView);
@@ -122,11 +122,11 @@ export function run() {
         expect(FirstPage).toBeDefined();
         expect(nav._views.length).toBe(0);
 
-        spyOn(nav, 'add').and.callThrough();
+        spyOn(nav, '_add').and.callThrough();
 
         nav.transition = mockTransitionFn;
         nav.push(FirstPage, {}, {}).then(() => {
-          expect(nav.add).toHaveBeenCalled();
+          expect(nav._add).toHaveBeenCalled();
           expect(nav._views.length).toBe(1);
           done();
         });

From 72ad5c1fb583715527c8f10077aa9e2a7df4dfc7 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 8 Oct 2015 23:54:50 -0500
Subject: [PATCH 11/15] init alpha40

---
 ionic/config/decorators.ts | 12 +++++++-----
 package.json               |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ionic/config/decorators.ts b/ionic/config/decorators.ts
index f53652a132..8bf56c3e38 100644
--- a/ionic/config/decorators.ts
+++ b/ionic/config/decorators.ts
@@ -125,17 +125,19 @@ export function App(args={}) {
     // get current annotations
     let annotations = Reflect.getMetadata('annotations', cls) || [];
 
-    // create @Component
+    // default to select <ion-app>
     args.selector = args.selector || 'ion-app';
-    annotations.push(new Component(args));
 
-    // create @View
-    // if no template was provided, default so it has a root ion-nav
+    // auto add Ionic directives
+    args.directives = args.directives ? args.directives.concat(IONIC_DIRECTIVES) : IONIC_DIRECTIVES;
+
+    // if no template was provided, default so it has a root <ion-nav>
     if (!args.templateUrl && !args.template) {
       args.template = '<ion-nav></ion-nav>';
     }
 
-    annotations.push(new PageImpl(args));
+    // create @Component
+    annotations.push(new Component(args));
 
     // redefine with added annotations
     Reflect.defineMetadata('annotations', annotations, cls);
diff --git a/package.json b/package.json
index d4b4796d9a..d40f6f4e99 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "link": "npm install && gulp src && npm link"
   },
   "dependencies": {
-    "angular2": "2.0.0-alpha.39",
+    "angular2": "2.0.0-alpha.40",
     "@reactivex/rxjs": "0.0.0-prealpha.3",
     "reflect-metadata": "0.1.1",
     "zone.js": "0.5.8"

From 17f64370fdc22d39318ade110f42d1079fdb2f2c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 9 Oct 2015 00:16:25 -0500
Subject: [PATCH 12/15] fix(navController): fix this.add and _popTo ref

---
 ionic/components/nav/nav-controller.ts | 13 ++++++++++---
 ionic/components/tabs/tabs.ts          |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 91edc2d10e..8e23c4c7b9 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -1,4 +1,4 @@
-import {ComponentRef, Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, AppViewManager} from 'angular2/angular2';
+import {Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, AppViewManager} from 'angular2/angular2';
 
 import {Ion} from '../ion';
 import {makeComponent} from '../../config/decorators';
@@ -305,7 +305,7 @@ export class NavController extends Ion {
    * @param opts extra animation options
    */
   popToRoot(opts = {}) {
-    this.popTo(this._views[0]);
+    this._popTo(this.first());
   }
 
   /**
@@ -542,7 +542,14 @@ export class NavController extends Ion {
         viewContainer.remove(index);
       }
     };
-    return new ComponentRef(newLocation, component, type, null, dispose);
+
+    // TODO: make-shift ComponentRef_, this is pretty much going to
+    // break in future versions of ng2, keep an eye on it
+    return {
+      location: newLocation,
+      instance: component,
+      dispose: dispose
+    };
   }
 
   /**
diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index 1d51a8318d..11c079f094 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -146,7 +146,7 @@ export class Tabs extends NavController {
    * TODO
    */
   addTab(tab) {
-    this.add(tab.viewCtrl);
+    this._add(tab.viewCtrl);
 
     // return true/false if it's the initial tab
     return (this.length() === 1);

From 8f1a0b40f9eee1172069e002e2be8977ac9e6b60 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 9 Oct 2015 00:18:02 -0500
Subject: [PATCH 13/15] Revert "NavController popTo takes componentType"

This reverts commit 63aebf8ba89120f3347977c69130ec1d86cf0410.
---
 ionic/components/nav/nav-controller.ts   | 30 +++++++-----------------
 ionic/components/nav/test/basic/index.ts |  5 ----
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index a443ec7194..91edc2d10e 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -253,15 +253,16 @@ export class NavController extends Ion {
   }
 
   /**
-   * Pop to a specific page in the history stack
+   * @private
+   * Pop to a specific view in the history stack
    *
-   * @param componentType the page to pop to
+   * @param view {ViewController} to pop to
    * @param opts {object} pop options
    */
-  popTo(componentType, opts = {}) {
+  _popTo(view, opts = {}) {
 
     // Get the target index of the view to pop to
-    let viewIndex = this.getIndexByComponentType(componentType);
+    let viewIndex = this._views.indexOf(view);
     let targetIndex = viewIndex + 1;
     let resolve;
     let promise = new Promise(res => { resolve = res; });
@@ -271,6 +272,7 @@ export class NavController extends Ion {
       return;
     }
 
+
     opts.direction = opts.direction || 'back';
 
     // get the views to auto remove without having to do a transiton for each
@@ -285,7 +287,7 @@ export class NavController extends Ion {
     }
 
     let leavingView = this._views[this._views.length - 1];
-    let enteringView = this.getByIndex(viewIndex);
+    let enteringView = view;
 
     if(this.router) {
       this.router.stateChange('pop', enteringView);
@@ -303,7 +305,7 @@ export class NavController extends Ion {
    * @param opts extra animation options
    */
   popToRoot(opts = {}) {
-    this.popTo(this._views[0].componentType);
+    this.popTo(this._views[0]);
   }
 
   /**
@@ -814,22 +816,6 @@ export class NavController extends Ion {
     return null;
   }
 
-  /**
-   * Get the index of the view with the specified componentType
-   * @param  componentType
-   * @return index
-   */
-  getIndexByComponentType(componentType) {
-    if (componentType) {
-      for (let i = 0, ii = this._views.length; i < ii; i++) {
-        if (this._views[i].componentType === componentType) {
-          return i;
-        }
-      }
-    }
-    return null;
-  }
-
   /**
    * TODO
    * @param {TODO} index  TODO
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index 91df16917d..d20838f9bf 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -105,7 +105,6 @@ class SecondPage {
         <button id="from3To2" (click)="pop()">Pop (Go back to 2nd)</button>
         <button id="insert" (click)="insert()">Insert first page into history before this</button>
         <button id="remove" (click)="removeSecond()">Remove second page in history</button>
-        <button id="popto" (click)="popTo()">popTo FirstPage</button>
       </p>
       <div class="yellow"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
     </ion-content>
@@ -130,10 +129,6 @@ class ThirdPage {
     this.nav.remove(1);
   }
 
-  popTo() {
-    this.nav.popTo(FirstPage);
-  }
-
 }
 
 

From a21aaa508051b69310f556e47aaf9ec009db0d28 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 9 Oct 2015 08:15:40 -0500
Subject: [PATCH 14/15] NavController remove tests

---
 .../nav/test/nav-controller.spec.ts           | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/ionic/components/nav/test/nav-controller.spec.ts b/ionic/components/nav/test/nav-controller.spec.ts
index 5c9469b123..e17713f45c 100644
--- a/ionic/components/nav/test/nav-controller.spec.ts
+++ b/ionic/components/nav/test/nav-controller.spec.ts
@@ -207,5 +207,39 @@ export function run() {
       });
     });
 
+    describe("remove", () => {
+      it('should remove the view at the specified index', () => {
+        let vc1 = new ViewController(),
+            vc2 = new ViewController(null, FirstPage),
+            vc3 = new ViewController(null, SecondPage);
+        nav._views = [vc1, vc2, vc3];
+        expect(nav._views.length).toBe(3);
+        expect(nav._views[1].componentType).toBe(FirstPage);
+
+        nav.remove(1);
+
+        expect(nav._views.length).toBe(2);
+        expect(nav._views[1].componentType).toBe(SecondPage);
+      });
+
+      it('should pop if index is of active view', () => {
+        let vc1 = new ViewController(),
+            vc2 = new ViewController(null, FirstPage),
+            vc3 = new ViewController(null, SecondPage);
+
+        vc3.state = 1; //ACTIVE_STATE
+        nav._views = [vc1, vc2, vc3];
+
+        spyOn(nav, 'pop').and.callThrough();
+
+        nav.remove(1);
+        expect(nav.pop).not.toHaveBeenCalled();
+
+        nav.remove(1);
+        expect(nav.pop).toHaveBeenCalled();
+
+      });
+    });
+
   });
 }

From 9255d473f13863eba8fcb5eaa27c9cbb30245168 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 9 Oct 2015 08:17:47 -0500
Subject: [PATCH 15/15] update angular test_lib bundle name

---
 scripts/karma/karma.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/karma/karma.conf.js b/scripts/karma/karma.conf.js
index ac5855f203..5a81f6a1ab 100644
--- a/scripts/karma/karma.conf.js
+++ b/scripts/karma/karma.conf.js
@@ -8,7 +8,7 @@ module.exports = function(config) {
     frameworks: ['jasmine'],
 
     files: buildConfig.scripts.concat([
-      'node_modules/angular2/bundles/test_lib.dev.js',
+      'node_modules/angular2/bundles/test_lib.js',
       'dist/tests/**/*.spec.js',
       'scripts/karma/test-main.js'
     ]),