feat(vex): support Angular RC5

feat(js-native): support Angular RC5

package.json

@@ -34,9 +34,10 @@
     "zone.js": "^0.6.12"
   },
   "devDependencies": {
-    "@angular/core": "2.0.0-rc.5",
-    "@angular/compiler": "2.0.0-rc.5",
     "@angular/common": "2.0.0-rc.5",
+    "@angular/compiler": "2.0.0-rc.5",
+    "@angular/core": "2.0.0-rc.5",
+    "@angular/forms": "^0.3.0",
     "@angular/platform-browser": "2.0.0-rc.5",
     "@angular/platform-browser-dynamic": "2.0.0-rc.5",
     "@angular/router": "3.0.0-rc.1",

src/components/angular2-modal/angular2-modal.module.ts

@@ -5,7 +5,6 @@ import { DOMOutsideEventPlugin } from './providers/outside-event-plugin';
 import { ModalRenderer, DOMModalRenderer } from '../angular2-modal';
 
 @NgModule({
-
 })
 export class ModalModule {
   static forRoot(): ModuleWithProviders {

src/components/angular2-modal/angular2-modal.ts

@@ -1,6 +1,8 @@
 import { Modal } from './providers/modal';
 
 export * from './framework/fluent-assign';
+export { createComponent } from './framework/createComponent';
+
 export { DialogRef } from './models/dialog-ref';
 
 export {

src/components/angular2-modal/framework/createComponent.ts

@@ -0,0 +1,27 @@
+import {
+  ComponentRef,
+  ComponentFactoryResolver,
+  ViewContainerRef,
+  ReflectiveInjector,
+  ResolvedReflectiveProvider
+} from '@angular/core';
+
+export function createComponent(cfr: ComponentFactoryResolver,
+                                        type: any,
+                                        vcr: ViewContainerRef,
+                                        bindings: ResolvedReflectiveProvider[]): ComponentRef<any> {
+  return vcr.createComponent(
+    cfr.resolveComponentFactory(type),
+    vcr.length,
+    getInjector(vcr, bindings)
+  );
+}
+
+function getInjector(viewContainer: ViewContainerRef, bindings: ResolvedReflectiveProvider[]) {
+  const ctxInjector = viewContainer.parentInjector;
+  return Array.isArray(bindings) && bindings.length > 0 ?
+    ReflectiveInjector.fromResolvedProviders(bindings, ctxInjector) : ctxInjector;
+
+}
+
+export default createComponent;

src/components/angular2-modal/plugins/bootstrap/bootstrap.module.ts

@@ -17,15 +17,8 @@ import {
   ModalDropInFactory
 } from '../../angular2-modal';
 
-@NgModule({
-  imports: [ CommonModule ],
-  declarations: [
-    BSModalBackdrop,
-    BSMessageModal,
-    BSModalContainer,
-    BSModalFooter
-  ],
-  providers: [
+function getProviders(): any[] {
+  return [
     { provide: BaseModal, useClass: Modal },
     { provide: Modal, useClass: Modal },
     { provide: ModalBackdropComponent, useValue: BSModalBackdrop },
@@ -34,11 +27,26 @@ import {
       prompt: modal => new OneButtonPresetBuilder(modal, <any>{isBlocking: true, keyboard: null}),
       confirm: modal => new TwoButtonPresetBuilder(modal, <any>{isBlocking: true, keyboard: null})
     }}
+  ];
+}
+
+@NgModule({
+  imports: [ CommonModule ],
+  declarations: [
+    BSModalBackdrop,
+    BSMessageModal,
+    BSModalContainer,
+    BSModalFooter
   ],
+  providers: getProviders(),
   entryComponents: [
     BSModalBackdrop,
     BSMessageModal
   ]
 })
-export class BootstrapModalModule {}
+export class BootstrapModalModule {
+  static getProviders(): any[] {
+    return getProviders();
+  }
+}
 

src/components/angular2-modal/plugins/bootstrap/modal-container.ts

@@ -2,7 +2,6 @@ import {
   Component,
   ComponentFactoryResolver,
   ViewContainerRef,
-  ReflectiveInjector,
   ViewChild,
   ViewEncapsulation,
   AfterViewInit,
@@ -15,7 +14,7 @@ import {
   transition
 } from '@angular/core';
 
-import { DialogRef, ModalCompileConfig } from '../../angular2-modal';
+import { createComponent, DialogRef, ModalCompileConfig } from '../../angular2-modal';
 
 import { Modal } from './modal';
 import { supportsKey } from '../../framework/utils';
@@ -92,13 +91,6 @@ export class BSModalContainer implements AfterViewInit {
   }
 
   ngAfterViewInit() {
-    const cmpFactory = this._cr.resolveComponentFactory(this._compileConfig.component as any),
-          vcr = this._viewContainer,
-          bindings = this._compileConfig.bindings,
-          ctxInjector = vcr.parentInjector,
-          childInjector = Array.isArray(bindings) && bindings.length > 0 ?
-                      ReflectiveInjector.fromResolvedProviders(bindings, ctxInjector) : ctxInjector;
-
     if (this.el.nativeElement) {
       this.el.nativeElement.focus();
     }
@@ -109,9 +101,13 @@ export class BSModalContainer implements AfterViewInit {
         a CD exception. setTimeout is a workaround that mimics the async behavior.
         Find out the error and remove setTimeout.
      */
-    setTimeout(
-      () => this.dialog.contentRef = vcr.createComponent(cmpFactory, vcr.length, childInjector)
-    );
+    setTimeout( () => {
+      this.dialog.contentRef = createComponent(
+        this._cr,
+        this._compileConfig.component,
+        this._viewContainer,
+        this._compileConfig.bindings);
+    });
   }
 
   onClickOutside() {

src/components/angular2-modal/plugins/js-native/index.ts

@@ -1,17 +1,4 @@
-import { Provider } from '@angular/core';
-
 import { Modal } from './modal';
-import { JSNativeModalRenderer } from './js-native-modal-renderer';
-import { JSNativePresetBuilder } from './presets/js-native-preset';
-
-import {
-    Modal as BaseModal,
-    MODAL_PROVIDERS,
-    ModalBackdropComponent,
-    ModalDropInFactory,
-    ModalRenderer,
-    DROP_IN_TYPE
-} from '../../angular2-modal';
 
 export { Modal, JSNativeModal } from './modal';
 export {
@@ -21,16 +8,4 @@ export {
 export { JSNativeModalRenderer } from './js-native-modal-renderer';
 export { JSNativePresetBuilder } from './presets/js-native-preset';
 
-
-export const JS_NATIVE_MODAL_PROVIDERS: any[] = [
-    ...MODAL_PROVIDERS,
-    new Provider(BaseModal, { useClass: Modal }),
-    new Provider(Modal, { useClass: Modal }),
-    new Provider(ModalRenderer, { useClass: JSNativeModalRenderer }),
-    new Provider(ModalBackdropComponent, { useValue: {} }),
-    new Provider(ModalDropInFactory, { useValue: {
-        alert: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.alert),
-        prompt: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.prompt),
-        confirm: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.confirm)
-    } })
-];
+export { JSNativeModalModule } from './js-native.module';

src/components/angular2-modal/plugins/js-native/js-native-modal-renderer.ts

@@ -15,7 +15,7 @@ export class JSNativeModalRenderer implements ModalRenderer {
     render(type: Type,
            viewContainer: ViewContainerRef,
            bindings: ResolvedReflectiveProvider[],
-           dialog: DialogRef<JSNativeModalContext>): Promise<DialogRef<any>> {
+           dialog: DialogRef<JSNativeModalContext>): DialogRef<any> {
 
         let result: string | boolean;
         switch (dialog.context.dialogType) {
@@ -39,7 +39,7 @@ export class JSNativeModalRenderer implements ModalRenderer {
             dialog.close(result);
         }
 
-        return Promise.resolve(dialog);
+        return dialog;
     }
 }
 

src/components/angular2-modal/plugins/js-native/js-native.module.ts

@@ -0,0 +1,38 @@
+import { NgModule } from '@angular/core';
+
+import { Modal } from './modal';
+import { JSNativeModalRenderer } from './js-native-modal-renderer';
+import { JSNativePresetBuilder } from './presets/js-native-preset';
+
+import {
+  Modal as BaseModal,
+  ModalBackdropComponent,
+  ModalDropInFactory,
+  ModalRenderer,
+  DROP_IN_TYPE
+} from '../../angular2-modal';
+
+function getProviders(): any[] {
+  return [
+    { provide: BaseModal, useClass: Modal },
+    { provide: Modal, useClass: Modal },
+    { provide: ModalRenderer, useClass: JSNativeModalRenderer },
+    { provide: ModalBackdropComponent, useValue: {} },
+    { provide: ModalDropInFactory, useValue: {
+      alert: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.alert),
+      prompt: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.prompt),
+      confirm: modal => new JSNativePresetBuilder(modal, DROP_IN_TYPE.confirm)
+    }}
+  ];
+}
+
+@NgModule({
+  providers: getProviders()
+})
+export class JSNativeModalModule {
+
+  static getProviders(): any[] {
+    return getProviders();
+  }
+
+}