From 4f26e6569145922b50ff1b634110a437a825f06a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Jun 2015 09:50:00 -0500
Subject: [PATCH] cleanup stuff

---
 ionic/components/nav/nav.js                      |  4 +---
 .../nav/test/basic/pages/second-page.js          |  3 +--
 .../nav/test/basic/pages/third-page.js           |  3 +--
 ionic/components/view/view-controller.js         |  9 +--------
 ionic/components/view/view-item.js               |  2 --
 scripts/e2e/angular.template.html                | 16 +++++++++++-----
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/ionic/components/nav/nav.js b/ionic/components/nav/nav.js
index e99180537a..2ac3725569 100644
--- a/ionic/components/nav/nav.js
+++ b/ionic/components/nav/nav.js
@@ -1,7 +1,5 @@
-import {Component, Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
-import {View} from 'angular2/src/core/annotations_impl/view';
+import {Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
 import {Optional} from 'angular2/src/di/annotations_impl';
-import {Parent} from 'angular2/src/core/annotations_impl/visibility';
 import {Compiler} from 'angular2/angular2';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
diff --git a/ionic/components/nav/test/basic/pages/second-page.js b/ionic/components/nav/test/basic/pages/second-page.js
index 12ef9f9fc5..785c490bc9 100644
--- a/ionic/components/nav/test/basic/pages/second-page.js
+++ b/ionic/components/nav/test/basic/pages/second-page.js
@@ -16,8 +16,7 @@ import {ThirdPage} from './third-page';
       <p>
         <button class="button" (click)="push()">Push (Go to 3rd)</button>
       </p>
-      <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 class="green"><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>
   `,
   directives: [NavbarTemplate, Navbar, Content]
diff --git a/ionic/components/nav/test/basic/pages/third-page.js b/ionic/components/nav/test/basic/pages/third-page.js
index 8bbdf6a132..64a752afcc 100644
--- a/ionic/components/nav/test/basic/pages/third-page.js
+++ b/ionic/components/nav/test/basic/pages/third-page.js
@@ -12,8 +12,7 @@ import {NavController, NavbarTemplate, Navbar, Content} from 'ionic/ionic';
       <p>
         <button class="button" (click)="pop()">Pop (Go back to 2nd)</button>
       </p>
-      <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 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>
   `,
   directives: [NavbarTemplate, Navbar, Content]
diff --git a/ionic/components/view/view-controller.js b/ionic/components/view/view-controller.js
index 89f1b6efd1..1caefd25e7 100644
--- a/ionic/components/view/view-controller.js
+++ b/ionic/components/view/view-controller.js
@@ -1,18 +1,11 @@
-import {Parent} from 'angular2/src/core/annotations_impl/visibility';
-import {Component, Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
-import {Optional} from 'angular2/src/di/annotations_impl'
-import {View} from 'angular2/src/core/annotations_impl/view';
+import {Compiler} from 'angular2/angular2';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {Injector} from 'angular2/di';
-import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
-import {Compiler} from 'angular2/angular2';
-import {bind} from 'angular2/di';
 
 import {ViewItem} from './view-item';
 import {NavController} from '../nav/nav-controller';
 import {PaneController} from '../nav/pane';
-import {NavParams} from '../nav/nav-params';
 import {Transition} from '../../transitions/transition';
 import {ClickBlock} from '../../util/click-block';
 import * as util from 'ionic/util';
diff --git a/ionic/components/view/view-item.js b/ionic/components/view/view-item.js
index 159824d4cb..4319c60018 100644
--- a/ionic/components/view/view-item.js
+++ b/ionic/components/view/view-item.js
@@ -47,7 +47,6 @@ export class ViewItem {
       // figure out the sturcture of this Component
       // does it have a navbar? Is it tabs? Should it not have a navbar or any toolbars?
       let itemStructure = this.sturcture = this.getProtoViewStructure(componentProtoViewRef);
-      console.log('Pane itemStructure', itemStructure.key);
 
       // get the appropriate Pane which this ViewItem will fit into
       viewCtrl.panes.get(itemStructure, pane => {
@@ -138,7 +137,6 @@ export class ViewItem {
         }
       });
     });
-console.log('getProtoViewStructure')
 
     if (this.viewCtrl.parentNavbar()) {
       navbar = false;
diff --git a/scripts/e2e/angular.template.html b/scripts/e2e/angular.template.html
index 697929f664..07f140dde0 100644
--- a/scripts/e2e/angular.template.html
+++ b/scripts/e2e/angular.template.html
@@ -11,19 +11,25 @@
     /* hack to create tall scrollable areas for testing using <f></f> */
     f {
       display: block;
-      margin: 10px auto;
-      max-width: 200px;
-      height: 200px;
+      margin: 15px auto;
+      max-width: 150px;
+      height: 150px;
       background: blue;
     }
     f:last-of-type {
       background: red;
     }
-    ion-tab:nth-of-type(2) f {
+    ion-tab:nth-of-type(2) f,
+    .green f {
       background: green;
+      max-width: 250px;
+      height: 100px;
     }
-    ion-tab:nth-of-type(3) f {
+    ion-tab:nth-of-type(3) f,
+    .yellow f {
       background: yellow;
+      width: 100px;
+      height: 50px;
     }
   </style>
 </head>