diff --git a/ionic/components/app/app.js b/ionic/components/app/app.js index 56183932f0..e9116e9f5d 100644 --- a/ionic/components/app/app.js +++ b/ionic/components/app/app.js @@ -105,8 +105,7 @@ export class IonicApp { let platformVersion = versions[platformName]; if (platformVersion) { platformClass += '_' + platformVersion.major; - className += platformClass; - className += platformClass + '_' + platformVersion.minor; + className += platformClass + platformClass + '_' + platformVersion.minor; } }); diff --git a/ionic/components/app/test/sink/pages/aside.js b/ionic/components/app/test/sink/pages/aside.js index 9cfd9e4f5a..1f66648d43 100644 --- a/ionic/components/app/test/sink/pages/aside.js +++ b/ionic/components/app/test/sink/pages/aside.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/card.js b/ionic/components/app/test/sink/pages/card.js index 3394ede190..648551e9b3 100644 --- a/ionic/components/app/test/sink/pages/card.js +++ b/ionic/components/app/test/sink/pages/card.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/form.js b/ionic/components/app/test/sink/pages/form.js index 697e8ba10d..10b42daa20 100644 --- a/ionic/components/app/test/sink/pages/form.js +++ b/ionic/components/app/test/sink/pages/form.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/ionicons.js b/ionic/components/app/test/sink/pages/ionicons.js index 5053357c20..372c67ea19 100644 --- a/ionic/components/app/test/sink/pages/ionicons.js +++ b/ionic/components/app/test/sink/pages/ionicons.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/list.js b/ionic/components/app/test/sink/pages/list.js index 28c9ec63dd..33bf8fe403 100644 --- a/ionic/components/app/test/sink/pages/list.js +++ b/ionic/components/app/test/sink/pages/list.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/modal.js b/ionic/components/app/test/sink/pages/modal.js index 868064fca4..7b240d4321 100644 --- a/ionic/components/app/test/sink/pages/modal.js +++ b/ionic/components/app/test/sink/pages/modal.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/nav.js b/ionic/components/app/test/sink/pages/nav.js index 5c642e1fb2..d617144103 100644 --- a/ionic/components/app/test/sink/pages/nav.js +++ b/ionic/components/app/test/sink/pages/nav.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/search-bar.js b/ionic/components/app/test/sink/pages/search-bar.js index 1c1754a673..dc70285a69 100644 --- a/ionic/components/app/test/sink/pages/search-bar.js +++ b/ionic/components/app/test/sink/pages/search-bar.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/segment.js b/ionic/components/app/test/sink/pages/segment.js index 40d2ab974b..4284ad7356 100644 --- a/ionic/components/app/test/sink/pages/segment.js +++ b/ionic/components/app/test/sink/pages/segment.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/slides.js b/ionic/components/app/test/sink/pages/slides.js index f65cccb8d8..4b0460944a 100644 --- a/ionic/components/app/test/sink/pages/slides.js +++ b/ionic/components/app/test/sink/pages/slides.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/table-search.js b/ionic/components/app/test/sink/pages/table-search.js index b2ff1806dc..c8b63eaec7 100644 --- a/ionic/components/app/test/sink/pages/table-search.js +++ b/ionic/components/app/test/sink/pages/table-search.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/app/test/sink/pages/tabs.js b/ionic/components/app/test/sink/pages/tabs.js index f855aecb3b..9ee748319a 100644 --- a/ionic/components/app/test/sink/pages/tabs.js +++ b/ionic/components/app/test/sink/pages/tabs.js @@ -1,4 +1,4 @@ -import {NgFor, DynamicComponentLoader, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; +import {NgFor, Injector, DomRenderer, ElementRef} from 'angular2/angular2'; import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/modal/test/basic/index.js b/ionic/components/modal/test/basic/index.js index 75e1a70847..ea6c878711 100644 --- a/ionic/components/modal/test/basic/index.js +++ b/ionic/components/modal/test/basic/index.js @@ -1,4 +1,4 @@ -import {DynamicComponentLoader, ElementRef, ComponentRef, onDestroy, DomRenderer} from 'angular2/angular2'; +import {ElementRef, ComponentRef, onDestroy, DomRenderer} from 'angular2/angular2'; import {bind, Injector} from 'angular2/di'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; diff --git a/ionic/components/nav/nav-push.js b/ionic/components/nav/nav-push.js index cf60c67d70..a8d61ce6eb 100644 --- a/ionic/components/nav/nav-push.js +++ b/ionic/components/nav/nav-push.js @@ -2,7 +2,6 @@ import {Directive, onInit} from 'angular2/src/core/annotations_impl/annotations' import {Optional} from 'angular2/src/di/annotations_impl'; 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 {ViewController} from '../view/view-controller'; diff --git a/ionic/components/view/view-item.js b/ionic/components/view/view-item.js index 13681798b2..d9491eab37 100644 --- a/ionic/components/view/view-item.js +++ b/ionic/components/view/view-item.js @@ -2,6 +2,7 @@ import {EventEmitter} from 'angular2/angular2'; import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; import {bind} from 'angular2/di'; +import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {ViewController} from '../view/view-controller'; import {NavController} from '../nav/nav-controller'; @@ -46,6 +47,8 @@ export class ViewItem { viewCtrl.panes.get(itemStructure, pane => { this.pane = pane; + let viewMngr = viewCtrl.injector.get(AppViewManager); + // create a new injector just for this ViewItem let injector = viewCtrl.injector.resolveAndCreateChild([ bind(ViewController).toValue(viewCtrl), @@ -60,7 +63,7 @@ export class ViewItem { let hostViewRef = contentContainer.create(componentProtoViewRef, -1, null, injector); // get the component's instance, and set it to the this ViewItem - this.setInstance( viewCtrl.loader._viewManager.getComponent(new ElementRef(hostViewRef, 0)) ); + this.setInstance( viewMngr.getComponent(new ElementRef(hostViewRef, 0)) ); this.viewElement( hostViewRef._view.render._view.rootNodes[0] ); // remember how to dispose of this reference