Merge pull request #216 from NativeScript/hdeshev/angular-rc1

hdeshev · hdeshev · commit 72efd85f1067 · 2016-05-05T16:52:52.000+03:00
Upgrade to ng rc1
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
@@ -27,11 +27,7 @@ import {ModalTest} from "./examples/modal/modal-test";
 import {PlatfromDirectivesTest} from "./examples/platform-directives/platform-directives-test";
 import {RouterOutletTest} from "./examples/navigation/router-outlet-test";
 
-nativeScriptBootstrap(RendererTest).then((compRef) => {
-    console.log("nativeScriptBootstrap resloved: " + compRef);
-}).catch((e) => {
-    console.log("nativeScriptBootstrap error: " + e);
-});
+nativeScriptBootstrap(RendererTest);
 //nativeScriptBootstrap(Benchmark);
 //nativeScriptBootstrap(ListTest);
 //nativeScriptBootstrap(ListTestAsync);
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig} from '@angular/router';
+import {RouteConfig} from '@angular/router-deprecated';
 import { Page} from "ui/page";
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
 import {NS_DIRECTIVES} from "../../nativescript-angular/directives";
diff --git a/ng-sample/app/examples/list/list-test-async.ts b/ng-sample/app/examples/list/list-test-async.ts
@@ -11,7 +11,7 @@ export class DataItem {
     template: `
     <GridLayout>
         <ListView [items]="myItems | async" (itemTap)="onItemTap($event)">
-            <template #item="item" #i="index" #odd="odd" #even="even">
+            <template let-item="item" let-i="index" let-odd="odd" let-even="even">
                 <StackLayout [class.odd]="odd" [class.even]="even">
                     <Label class="test" [text]='"index: " + item.name'></Label>
                 </StackLayout>
diff --git a/ng-sample/app/examples/list/list-test.ts b/ng-sample/app/examples/list/list-test.ts
@@ -30,7 +30,7 @@ class DataItem {
             <Label row="0" text="-==START==-" fontSize="20"></Label>
             <GridLayout row="1">
                 <ListView [items]="myItems" (itemTap)="onItemTap($event)">
-                    <template #item="item" #i="index" #odd="odd" #even="even">
+                    <template let-item="item" let-i="index" let-odd="odd" let-even="even">
                         <StackLayout [class.odd]="odd" [class.even]="even">
                             <Label [text]='"index: " + i'></Label>
                             <Label [text]='"[" + item.id +"] " + item.name'></Label>
diff --git a/ng-sample/app/examples/navigation/nav-component.ts b/ng-sample/app/examples/navigation/nav-component.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {ROUTER_DIRECTIVES, Router, OnActivate, OnDeactivate, CanReuse, OnReuse,
- RouteParams, ComponentInstruction, RouteConfig } from '@angular/router';
+ RouteParams, ComponentInstruction, RouteConfig } from '@angular/router-deprecated';
 import {Location, LocationStrategy} from '@angular/common';
 import {topmost} from "ui/frame";
 import {Page} from "ui/page";
diff --git a/ng-sample/app/examples/navigation/navigation-test.ts b/ng-sample/app/examples/navigation/navigation-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router';
+import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router-deprecated';
 
 import {NavComponent} from "./nav-component";
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
diff --git a/ng-sample/app/examples/navigation/router-outlet-test.ts b/ng-sample/app/examples/navigation/router-outlet-test.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router';
+import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router-deprecated';
 import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
 
 @Component({
diff --git a/ng-sample/app/examples/renderer-test.html b/ng-sample/app/examples/renderer-test.html
@@ -24,8 +24,8 @@
     <TextView *ngIf='showDetails' [text]='detailsText'></TextView>
     <Label text='==============================' fontSize='20'></Label>
     <StackLayout #more *ngIf='showDetails' orientation='vertical'>
-        <TextField *ngFor='#detailLine of detailLines' [text]='detailLine'></TextField>
+        <TextField *ngFor='let detailLine of detailLines' [text]='detailLine'></TextField>
     </StackLayout>
     <Label text='==============================' fontSize='20'></Label>
     <templated-component [renderChild]="true"></templated-component>
-</StackLayout>
+</StackLayout>
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -25,25 +25,25 @@
 	"dependencies": {
 		"tns-core-modules": "^2.0.0",
 		"nativescript-intl": "^0.0.2",
-		"@angular/common": "0.0.0-0",
-		"@angular/compiler": "0.0.0-0",
-		"@angular/core": "0.0.0-0",
-		"@angular/router": "0.0.0-0",
-		"@angular/platform-browser": "0.0.0-0",
-		"@angular/platform-browser-dynamic": "0.0.0-0",
-		"@angular/platform-server": "0.0.0-0",
+		"@angular/common": "2.0.0-rc.1",
+		"@angular/compiler": "2.0.0-rc.1",
+		"@angular/core": "2.0.0-rc.1",
+		"@angular/router-deprecated": "2.0.0-rc.1",
+		"@angular/platform-browser": "2.0.0-rc.1",
+		"@angular/platform-browser-dynamic": "2.0.0-rc.1",
+		"@angular/platform-server": "2.0.0-rc.1",
 		"reflect-metadata": "^0.1.3",
-		"rxjs": "5.0.0-beta.2",
+		"rxjs": "5.0.0-beta.6",
 		"zone.js": "^0.6.12",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
 		"url": "0.10.3"
 	},
 	"devDependencies": {
-		"babel-traverse": "6.7.6",
-		"babel-types": "6.7.7",
-		"babylon": "6.7.0",
+		"babel-traverse": "6.8.0",
+		"babel-types": "6.8.1",
+		"babylon": "6.8.0",
 		"filewalker": "0.1.2",
 		"grunt": "0.4.5",
 		"grunt-contrib-clean": "0.6.0",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
   "homepage": "http://www.telerik.com",
   "bugs": "http://www.telerik.com",
@@ -16,15 +16,15 @@
   "dependencies": {
     "tns-core-modules": "^2.0.0",
     "nativescript-intl": "^0.0.2",
-    "@angular/common": "0.0.0-0",
-    "@angular/compiler": "0.0.0-0",
-    "@angular/core": "0.0.0-0",
-    "@angular/router": "0.0.0-0",
-    "@angular/platform-browser": "0.0.0-0",
-    "@angular/platform-browser-dynamic": "0.0.0-0",
-    "@angular/platform-server": "0.0.0-0",
+    "@angular/common": "2.0.0-rc.1",
+    "@angular/compiler": "2.0.0-rc.1",
+    "@angular/core": "2.0.0-rc.1",
+    "@angular/router-deprecated": "2.0.0-rc.1",
+    "@angular/platform-browser": "2.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.1",
+    "@angular/platform-server": "2.0.0-rc.1",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
     "parse5": "1.4.2",
     "punycode": "1.3.2",
@@ -40,7 +40,7 @@
     "grunt-env": "0.4.4",
     "grunt-ts": "5.0.0-beta.5",
     "shelljs": "^0.5.3",
-    "typescript": "1.8.2"
+    "typescript": "^1.8.10"
   },
   "peerDependencies": {
     "tns-core-modules": ">=2.0.0 || >=2.0.0-2016 || >=2.0.0-angular-4"
diff --git a/src/nativescript-angular/application.ts b/src/nativescript-angular/application.ts
@@ -1,17 +1,17 @@
 import 'globals';
-global.window = global;
 import "zone.js/dist/zone-node"
 
 import 'reflect-metadata';
 import './polyfills/array';
+import {SanitizationService} from '@angular/core/src/security';
 import {isPresent, Type, print} from '@angular/core/src/facade/lang';
 import {ReflectiveInjector, reflector, coreLoadAndBootstrap, createPlatform, 
         getPlatform, assertPlatform, ComponentRef, PlatformRef, PLATFORM_DIRECTIVES, PLATFORM_PIPES} from '@angular/core';
 import {bind, provide, Provider} from '@angular/core/src/di';
 
 import {RootRenderer, Renderer} from '@angular/core/src/render/api';
 import {NativeScriptRootRenderer, NativeScriptRenderer} from './renderer';
-import {NativeScriptDomAdapter, NativeScriptElementSchemaRegistry} from './dom_adapter';
+import {NativeScriptDomAdapter, NativeScriptElementSchemaRegistry, NativeScriptSanitizationService} from './dom_adapter';
 import {ElementSchemaRegistry, XHR, COMPILER_PROVIDERS} from '@angular/compiler';
 import {FileSystemXHR} from './xhr';
 import {Parse5DomAdapter} from '@angular/platform-server/src/parse5_adapter';
@@ -46,7 +46,7 @@ class ConsoleLogger {
 }
 
 export function bootstrap(appComponentType: any,
-    customProviders: ProviderArray = null): Promise<ComponentRef> {
+    customProviders: ProviderArray = null): Promise<ComponentRef<any>> {
     NativeScriptDomAdapter.makeCurrent();
 
     let platformProviders: ProviderArray = [
@@ -69,6 +69,7 @@ export function bootstrap(appComponentType: any,
         provide(RootRenderer, { useClass: NativeScriptRootRenderer }),
         NativeScriptRenderer,
         provide(Renderer, { useClass: NativeScriptRenderer }),
+        provide(SanitizationService, { useClass: NativeScriptSanitizationService }),
         provide(ElementSchemaRegistry, { useClass: NativeScriptElementSchemaRegistry }),
         COMPILER_PROVIDERS,
         provide(ElementSchemaRegistry, { useClass: NativeScriptElementSchemaRegistry }),
@@ -90,7 +91,7 @@ export function bootstrap(appComponentType: any,
     return coreLoadAndBootstrap(appInjector, appComponentType);
 }
 
-export function nativeScriptBootstrap(appComponentType: any, customProviders?: ProviderArray, appOptions?: AppOptions): Promise<ComponentRef> {
+export function nativeScriptBootstrap(appComponentType: any, customProviders?: ProviderArray, appOptions?: AppOptions): Promise<ComponentRef<any>> {
     if (appOptions && appOptions.cssFile) {
         application.cssFile = appOptions.cssFile;
     }
diff --git a/src/nativescript-angular/common/detached-loader.ts b/src/nativescript-angular/common/detached-loader.ts
@@ -1,8 +1,9 @@
 import {DynamicComponentLoader, ComponentRef, ViewContainerRef, Component, Type, ViewChild} from '@angular/core';
 
+type AnyComponentRef = ComponentRef<any>;
 interface PendingLoadEntry {
     componentType: Type;
-    resolveCallback: (ComponentRef) => void;
+    resolveCallback: (AnyComponentRef) => void;
 }
 
 /**
@@ -34,11 +35,11 @@ export class DetachedLoader {
         });
     }
 
-    private loadInLocation(componentType: Type): Promise<ComponentRef> {
+    private loadInLocation(componentType: Type): Promise<ComponentRef<any>> {
         return this.loader.loadNextToLocation(componentType, this.containerRef);
     }
 
-    public loadComponent(componentType: Type): Promise<ComponentRef> {
+    public loadComponent(componentType: Type): Promise<ComponentRef<any>> {
         // Check if called before placeholder is initialized.
         // Delay load if so.
         if (this.viewLoaded) {
diff --git a/src/nativescript-angular/directives/dialogs.ts b/src/nativescript-angular/directives/dialogs.ts
@@ -35,7 +35,7 @@ export class ModalDialogService {
         return new Promise((resove, reject) => {
             const page = new Page();
 
-            var detachedLoaderRef: ComponentRef;
+            var detachedLoaderRef: ComponentRef<DetachedLoader>;
             const closeCallback = (...args) => {
                 resove.apply(undefined, args);
                 page.closeModal();
diff --git a/src/nativescript-angular/directives/list-view-comp.ts b/src/nativescript-angular/directives/list-view-comp.ts
@@ -22,8 +22,19 @@ import {ObservableArray} from 'data/observable-array';
 import {LayoutBase} from 'ui/layouts/layout-base';
 const NG_VIEW = "_ngViewRef";
 
+export class ListItemContext {
+    constructor(
+        public $implicit?: any,
+        public item?: any,
+        public index?: number,
+        public even?: boolean,
+        public odd?: boolean
+    ) {
+    }
+}
+
 export interface SetupItemViewArgs {
-    view: EmbeddedViewRef;
+    view: EmbeddedViewRef<any>;
     data: any;
     index: number;
 }
@@ -45,7 +56,7 @@ export class ListViewComponent {
 
     @Output() public setupItemView: EventEmitter<SetupItemViewArgs> = new EventEmitter<SetupItemViewArgs>();
 
-    @ContentChild(TemplateRef) itemTemplate: TemplateRef;
+    @ContentChild(TemplateRef) itemTemplate: TemplateRef<ListItemContext>;
 
     set items(value: any) {
         this._items = value;
@@ -77,28 +88,30 @@ export class ListViewComponent {
         let index = args.index;
         let items = args.object.items;
         let currentItem = typeof (items.getItem) === "function" ? items.getItem(index) : items[index];
-        let viewRef: EmbeddedViewRef;
+        let viewRef: EmbeddedViewRef<ListItemContext>;
 
         if (args.view) {
             console.log("ListView.onItemLoading: " + index + " - Reusing exisiting view");
             viewRef = args.view[NG_VIEW];
         }
         else {
             console.log("ListView.onItemLoading: " + index + " - Creating view from template");
-            viewRef = this.loader.createEmbeddedView(this.itemTemplate, 0);
+            viewRef = this.loader.createEmbeddedView(this.itemTemplate, new ListItemContext(), 0);
             args.view = getSingleViewFromViewRef(viewRef);
             args.view[NG_VIEW] = viewRef;
         }
         this.setupViewRef(viewRef, currentItem, index);
     }
 
-    public setupViewRef(viewRef: EmbeddedViewRef, data: any, index: number): void {
-        viewRef.setLocal('\$implicit', data);
-        viewRef.setLocal("item", data);
-        viewRef.setLocal("index", index);
-        viewRef.setLocal('even', (index % 2 == 0));
-        viewRef.setLocal('odd', (index % 2 == 1));
-        this.setupItemView.next({'view': viewRef, 'data': data, 'index': index});
+    public setupViewRef(viewRef: EmbeddedViewRef<ListItemContext>, data: any, index: number): void {
+        const context = viewRef.context;
+        context.$implicit = data;
+        context.item = data;
+        context.index = index;
+        context.even = (index % 2 == 0);
+        context.odd = !context.even;
+
+        this.setupItemView.next({view: viewRef, data: data, index: index, context: context});
     }
 
     ngDoCheck() {
@@ -118,7 +131,7 @@ export class ListViewComponent {
     }
 }
 
-function getSingleViewFromViewRef(viewRef: EmbeddedViewRef): View {
+function getSingleViewFromViewRef(viewRef: EmbeddedViewRef<any>): View {
     var getSingleViewRecursive = (nodes: Array<any>, nestLevel: number) => {
         var actualNodes = nodes.filter((n) => !!n && n.nodeName !== "#text");
 
diff --git a/src/nativescript-angular/directives/tab-view.ts b/src/nativescript-angular/directives/tab-view.ts
@@ -39,7 +39,7 @@ export class TabViewItemDirective {
 
     constructor(
         private owner: TabViewDirective,
-        private templateRef: TemplateRef,
+        private templateRef: TemplateRef<any>,
         private viewContainer: ViewContainerRef
     ) {
     }
diff --git a/src/nativescript-angular/dom_adapter.ts b/src/nativescript-angular/dom_adapter.ts
@@ -1,8 +1,18 @@
 import {ElementSchemaRegistry} from '@angular/compiler';
-import {Parse5DomAdapter} from '@angular/platform-server/src/parse5_adapter';
+import {SanitizationService} from '@angular/core/src/security';
+import {Parse5DomAdapter} from '@angular/platform-server';
 import {setRootDomAdapter} from '@angular/platform-browser/src/dom/dom_adapter';
 import {Type} from '@angular/core/src/facade/lang';
 
+export enum SecurityContext {
+  NONE,
+  HTML,
+  STYLE,
+  SCRIPT,
+  URL,
+  RESOURCE_URL,
+}
+
 export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
   hasProperty(tagName: string, propName: string): boolean {
       return true;
@@ -11,6 +21,16 @@ export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
   getMappedPropName(propName: string): string {
       return propName;
   }
+
+  securityContext(tagName: string, propName: string): any {
+      return SecurityContext.NONE;
+  }
+}
+
+export class NativeScriptSanitizationService extends SanitizationService {
+    sanitize(context: SecurityContext, value: string): string {
+        return value;
+    }
 }
 
 export class NativeScriptDomAdapter extends Parse5DomAdapter {
diff --git a/src/nativescript-angular/router/ns-router-link.ts b/src/nativescript-angular/router/ns-router-link.ts
@@ -1,6 +1,6 @@
 import {Directive, Input} from '@angular/core';
 import {isString} from '@angular/core/src/facade/lang';
-import {Router, Instruction} from '@angular/router';
+import {Router, Instruction} from '@angular/router-deprecated';
 import {Location} from '@angular/common';
 import { log } from "./common";
 
diff --git a/src/nativescript-angular/router/ns-router.ts b/src/nativescript-angular/router/ns-router.ts
@@ -2,7 +2,7 @@ import {Type} from '@angular/core/src/facade/lang';
 import {NSRouterLink} from './ns-router-link';
 import {PageRouterOutlet} from './page-router-outlet';
 import {NSLocationStrategy} from './ns-location-strategy';
-import {ROUTER_PROVIDERS} from '@angular/router';
+import {ROUTER_PROVIDERS} from '@angular/router-deprecated';
 import {LocationStrategy} from '@angular/common';
 import {provide} from '@angular/core';
 import { CATEGORY } from "./common";
diff --git a/src/nativescript-angular/router/page-router-outlet.ts b/src/nativescript-angular/router/page-router-outlet.ts
diff --git a/tests/app/snippets/icon-font.component.xml b/tests/app/snippets/icon-font.component.xml
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
diff --git a/tests/app/tests/router.ts b/tests/app/tests/router.ts
diff --git a/tests/app/tests/test-app.ts b/tests/app/tests/test-app.ts
diff --git a/tests/app/tests/third-party.ts b/tests/app/tests/third-party.ts
diff --git a/tests/package.json b/tests/package.json
