Skip to content

Commit aa69f5e

Browse files
hdeshevhdeshev
committed
Upgrade app code to Angular RC0 packages.
Compiling and running ng-sample.
1 parent c1b20e5 commit aa69f5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+192
-158
lines changed

‎ng-sample/app/examples/action-bar/action-bar-test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Component} from 'angular2/core';
2-
import {RouteConfig} from 'angular2/router';
1+
import {Component} from '@angular/core';
2+
import {RouteConfig} from '@angular/router';
33
import { Page} from "ui/page";
44
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
55
import {NS_DIRECTIVES} from "../../nativescript-angular/directives";

‎ng-sample/app/examples/image/image-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22

33
/* IMPORTANT
44
In order to test out the full image example, to fix the App Transport Security error in iOS 9, you will need to follow this after adding the iOS platform:

‎ng-sample/app/examples/list/list-test-async.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, Input, ChangeDetectionStrategy } from 'angular2/core';
1+
import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
22
import { Observable as RxObservable } from 'rxjs/Observable';
33

44
export class DataItem {
@@ -55,4 +55,4 @@ export class ListTestAsync {
5555
public onItemTap(args) {
5656
console.log("------------------------ ItemTapped: " + args.index);
5757
}
58-
}
58+
}

‎ng-sample/app/examples/list/list-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, Input, WrappedValue, ChangeDetectionStrategy} from 'angular2/core';
1+
import {Component, Input, WrappedValue, ChangeDetectionStrategy} from '@angular/core';
22
import {Label} from 'ui/label';
33
import {ObservableArray} from 'data/observable-array';
44

‎ng-sample/app/examples/modal/modal-content.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22
import {ModalDialogParams} from "../../nativescript-angular/directives/dialogs";
33

44
@Component({
@@ -32,4 +32,4 @@ export class ModalContent {
3232
ngOnDestroy() {
3333
console.log("ModalContent.ngOnDestroy");
3434
}
35-
}
35+
}

‎ng-sample/app/examples/modal/modal-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22
import * as dialogs from "ui/dialogs";
33
import {ModalDialogService, ModalDialogOptions, ModalDialogHost} from "../../nativescript-angular/directives/dialogs";
44
import {ModalContent} from "./modal-content";

‎ng-sample/app/examples/navigation/nav-component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22
import {ROUTER_DIRECTIVES, Router, OnActivate, OnDeactivate, CanReuse, OnReuse,
3-
RouteParams, ComponentInstruction, RouteConfig } from 'angular2/router';
4-
import {Location, LocationStrategy} from 'angular2/platform/common';
3+
RouteParams, ComponentInstruction, RouteConfig } from '@angular/router';
4+
import {Location, LocationStrategy} from '@angular/common';
55
import {topmost} from "ui/frame";
66
import {Page} from "ui/page";
77
import {NS_ROUTER_DIRECTIVES} from "../../nativescript-angular/router/ns-router";
@@ -134,4 +134,4 @@ export class NavComponent implements OnActivate, OnDeactivate {
134134
routerOnReuse(nextInstruction: ComponentInstruction, prevInstruction: ComponentInstruction): any {
135135
console.log("NavComponent.routerOnReuse() componentID: " + this.compId);
136136
}
137-
}
137+
}

‎ng-sample/app/examples/navigation/navigation-test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Component} from 'angular2/core';
2-
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from 'angular2/router';
1+
import {Component} from '@angular/core';
2+
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router';
33

44
import {NavComponent} from "./nav-component";
55
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";

‎ng-sample/app/examples/navigation/router-outlet-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Component} from 'angular2/core';
2-
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from 'angular2/router';
1+
import {Component} from '@angular/core';
2+
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router';
33
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
44

55
@Component({
@@ -50,4 +50,4 @@ class SecondComponent {
5050
{ path: '/first', component: FirstComponent, name: 'First', useAsDefault: true },
5151
{ path: '/second/:id', component: SecondComponent, name: 'Second' },
5252
])
53-
export class RouterOutletTest { }
53+
export class RouterOutletTest { }

‎ng-sample/app/examples/platform-directives/platform-directives-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component} from 'angular2/core';
1+
import {Component} from '@angular/core';
22

33
@Component({
44
selector: 'action-bar-test',

‎ng-sample/app/examples/renderer-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, Directive, Host, ElementRef, Input} from 'angular2/core';
1+
import {Component, Directive, Host, ElementRef, Input} from '@angular/core';
22
import {Observable} from 'data/observable';
33
import {TextValueAccessor} from '../nativescript-angular/value-accessors/text-value-accessor';
44
import {CheckedValueAccessor} from '../nativescript-angular/value-accessors/checked-value-accessor';

‎ng-sample/app/performance/benchmark.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {StackLayout} from 'ui/layouts/stack-layout';
22
import {Button} from 'ui/button';
33
import {Label} from 'ui/label';
4-
import {Inject, Component} from 'angular2/core';
5-
import {ApplicationRef} from 'angular2/src/core/application_ref';
4+
import {Inject, Component, ApplicationRef} from '@angular/core';
65
import * as profiling from './profiling';
76

87
@Component({

‎ng-sample/package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,22 @@
2323
},
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
26-
"tns-core-modules": "^2.0.0-angular-4",
26+
"tns-core-modules": "^2.0.0",
2727
"nativescript-intl": "^0.0.2",
28-
"angular2": "2.0.0-beta.16",
29-
"es6-shim": "^0.35.0",
28+
"@angular/common": "0.0.0-0",
29+
"@angular/compiler": "0.0.0-0",
30+
"@angular/core": "0.0.0-0",
31+
"@angular/router": "0.0.0-0",
32+
"@angular/platform-browser": "0.0.0-0",
33+
"@angular/platform-browser-dynamic": "0.0.0-0",
34+
"@angular/platform-server": "0.0.0-0",
35+
"reflect-metadata": "^0.1.3",
36+
"rxjs": "5.0.0-beta.2",
37+
"zone.js": "^0.6.12",
3038
"parse5": "1.4.2",
3139
"punycode": "1.3.2",
3240
"querystring": "0.2.0",
33-
"url": "0.10.3",
34-
"reflect-metadata": "0.1.2",
35-
"rxjs": "5.0.0-beta.2",
36-
"zone.js": "^0.6.12"
41+
"url": "0.10.3"
3742
},
3843
"devDependencies": {
3944
"babel-traverse": "6.7.6",

‎package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616
"dependencies": {
1717
"tns-core-modules": "^2.0.0",
1818
"nativescript-intl": "^0.0.2",
19-
"angular2": "2.0.0-beta.16",
20-
"es6-shim": "^0.35.0",
19+
"@angular/common": "0.0.0-0",
20+
"@angular/compiler": "0.0.0-0",
21+
"@angular/core": "0.0.0-0",
22+
"@angular/router": "0.0.0-0",
23+
"@angular/platform-browser": "0.0.0-0",
24+
"@angular/platform-browser-dynamic": "0.0.0-0",
25+
"@angular/platform-server": "0.0.0-0",
26+
"reflect-metadata": "^0.1.3",
27+
"rxjs": "5.0.0-beta.2",
28+
"zone.js": "^0.6.12",
2129
"parse5": "1.4.2",
2230
"punycode": "1.3.2",
2331
"querystring": "0.2.0",
24-
"url": "0.10.3",
25-
"reflect-metadata": "0.1.2",
26-
"rxjs": "5.0.0-beta.2",
27-
"zone.js": "^0.6.12"
32+
"url": "0.10.3"
2833
},
2934
"devDependencies": {
3035
"grunt": "0.4.5",

‎src/nativescript-angular/application.ts

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
import 'globals';
2+
global.window = global;
23
import "zone.js/dist/zone-node"
34

45
import 'reflect-metadata';
56
import './polyfills/array';
6-
import {isPresent, Type} from 'angular2/src/facade/lang';
7+
import {isPresent, Type, print} from '@angular/core/src/facade/lang';
78
import {ReflectiveInjector, reflector, coreLoadAndBootstrap, createPlatform,
8-
getPlatform, assertPlatform, ComponentRef, PlatformRef, PLATFORM_DIRECTIVES, PLATFORM_PIPES} from 'angular2/core';
9-
import {bind, provide, Provider} from 'angular2/src/core/di';
10-
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
9+
getPlatform, assertPlatform, ComponentRef, PlatformRef, PLATFORM_DIRECTIVES, PLATFORM_PIPES} from '@angular/core';
10+
import {bind, provide, Provider} from '@angular/core/src/di';
1111

12-
import {RootRenderer, Renderer} from 'angular2/src/core/render/api';
12+
import {RootRenderer, Renderer} from '@angular/core/src/render/api';
1313
import {NativeScriptRootRenderer, NativeScriptRenderer} from './renderer';
14-
import {NativeScriptDomAdapter} from './dom_adapter';
15-
import {XHR} from 'angular2/src/compiler/xhr';
14+
import {NativeScriptDomAdapter, NativeScriptElementSchemaRegistry} from './dom_adapter';
15+
import {ElementSchemaRegistry, XHR, COMPILER_PROVIDERS} from '@angular/compiler';
1616
import {FileSystemXHR} from './xhr';
17-
import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
18-
import {ExceptionHandler} from 'angular2/src/facade/exception_handler';
19-
import {APPLICATION_COMMON_PROVIDERS} from 'angular2/src/core/application_common_providers';
20-
import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler';
21-
import {PLATFORM_COMMON_PROVIDERS} from 'angular2/src/core/platform_common_providers';
22-
import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "angular2/common";
17+
import {Parse5DomAdapter} from '@angular/platform-server/src/parse5_adapter';
18+
import {ExceptionHandler} from '@angular/core/src/facade/exception_handler';
19+
import {APPLICATION_COMMON_PROVIDERS} from '@angular/core/src/application_common_providers';
20+
import {PLATFORM_COMMON_PROVIDERS} from '@angular/core/src/platform_common_providers';
21+
import {COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS} from "@angular/common";
2322
import {NS_DIRECTIVES} from './directives';
24-
import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities';
25-
import {bootstrap as angularBootstrap} from 'angular2/platform/browser';
23+
import {ReflectionCapabilities} from '@angular/core/src/reflection/reflection_capabilities';
2624

2725
import {Page} from 'ui/page';
2826
import {TextView} from 'ui/text-view';
@@ -40,6 +38,13 @@ export interface AppOptions {
4038
startPageActionBarHidden?: boolean;
4139
}
4240

41+
class ConsoleLogger {
42+
log = print;
43+
logError = print;
44+
logGroup = print;
45+
logGroupEnd() {}
46+
}
47+
4348
export function bootstrap(appComponentType: any,
4449
customProviders: ProviderArray = null): Promise<ComponentRef> {
4550
NativeScriptDomAdapter.makeCurrent();
@@ -54,15 +59,19 @@ export function bootstrap(appComponentType: any,
5459
provide(PLATFORM_PIPES, { useValue: COMMON_PIPES, multi: true }),
5560
provide(PLATFORM_DIRECTIVES, { useValue: COMMON_DIRECTIVES, multi: true }),
5661
provide(PLATFORM_DIRECTIVES, { useValue: NS_DIRECTIVES, multi: true }),
57-
provide(ExceptionHandler, { useFactory: () => new ExceptionHandler(DOM, true), deps: [] }),
62+
provide(ExceptionHandler, { useFactory: () => {
63+
return new ExceptionHandler(new ConsoleLogger(), true)
64+
}, deps: [] }),
5865

5966
defaultPageProvider,
6067
defaultDeviceProvider,
6168
NativeScriptRootRenderer,
6269
provide(RootRenderer, { useClass: NativeScriptRootRenderer }),
6370
NativeScriptRenderer,
6471
provide(Renderer, { useClass: NativeScriptRenderer }),
72+
provide(ElementSchemaRegistry, { useClass: NativeScriptElementSchemaRegistry }),
6573
COMPILER_PROVIDERS,
74+
provide(ElementSchemaRegistry, { useClass: NativeScriptElementSchemaRegistry }),
6675
provide(XHR, { useClass: FileSystemXHR }),
6776
]
6877

‎src/nativescript-angular/common/detached-loader.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {DynamicComponentLoader, ComponentRef, ViewContainerRef, Component, Type, ViewChild} from 'angular2/core';
1+
import {DynamicComponentLoader, ComponentRef, ViewContainerRef, Component, Type, ViewChild} from '@angular/core';
22

33
/**
44
* Wrapper component used for loading components when navigating
@@ -19,4 +19,4 @@ export class DetachedLoader {
1919
public loadComponent(componentType: Type): Promise<ComponentRef> {
2020
return this.loader.loadNextToLocation(componentType, this.containerRef);
2121
}
22-
}
22+
}

‎src/nativescript-angular/directives.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Type} from 'angular2/src/facade/lang';
1+
import {Type} from '@angular/core/src/facade/lang';
22
import {ListViewComponent, SetupItemViewArgs} from './directives/list-view-comp';
33
import {TextValueAccessor} from './value-accessors/text-value-accessor';
44
import {CheckedValueAccessor} from './value-accessors/checked-value-accessor';
@@ -37,4 +37,4 @@ export {NumberValueAccessor} from './value-accessors/number-value-accessor';
3737
export {SelectedIndexValueAccessor} from './value-accessors/selectedIndex-value-accessor';
3838
export {TabViewDirective, TabViewItemDirective} from './directives/tab-view';
3939
export {ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective} from './directives/action-bar';
40-
export {AndroidFilterComponent, IosFilterComponent} from './directives/platform-filters';
40+
export {AndroidFilterComponent, IosFilterComponent} from './directives/platform-filters';

‎src/nativescript-angular/directives/action-bar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Directive, Component, ContentChildren, ElementRef, Optional} from 'angular2/core';
1+
import {Directive, Component, ContentChildren, ElementRef, Optional} from '@angular/core';
22
import {ActionItem, ActionBar, NavigationButton} from "ui/action-bar";
3-
import {isBlank} from "angular2/src/facade/lang";
3+
import {isBlank} from "@angular/core/src/facade/lang";
44
import {Page} from "ui/page";
55
import {View} from 'ui/core/view';
66
import {registerElement, ViewClassMeta, NgView } from '../element-registry';

‎src/nativescript-angular/directives/dialogs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ReflectiveInjector, DynamicComponentLoader, ViewContainerRef, Injector, provide, Type, Injectable, ComponentRef, Directive} from 'angular2/core';
1+
import {ReflectiveInjector, DynamicComponentLoader, ViewContainerRef, Injector, provide, Type, Injectable, ComponentRef, Directive} from '@angular/core';
22
import {Page} from 'ui/page';
33
import {View} from 'ui/core/view';
44
import {DetachedLoader} from '../common/detached-loader';

‎src/nativescript-angular/directives/list-view-comp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
ChangeDetectorRef,
1313
EventEmitter,
1414
ViewChild,
15-
Output} from 'angular2/core';
16-
import {isListLikeIterable} from 'angular2/src/facade/collection';
15+
Output} from '@angular/core';
16+
import {isListLikeIterable} from '@angular/core/src/facade/collection';
1717
import {Observable as RxObservable} from 'rxjs'
1818
import {ListView} from 'ui/list-view';
1919
import {View} from 'ui/core/view';

‎src/nativescript-angular/directives/platform-filters.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, Inject} from 'angular2/core';
1+
import {Component, Inject} from '@angular/core';
22
import {Device, platformNames} from "platform";
33
import {DEVICE} from "../platform-providers";
44

@@ -22,4 +22,4 @@ export class IosFilterComponent {
2222
constructor( @Inject(DEVICE) device: Device) {
2323
this.show = (device.os === platformNames.ios);
2424
}
25-
}
25+
}

‎src/nativescript-angular/directives/tab-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ElementRef, Directive, Input, TemplateRef, ViewContainerRef} from "angular2/core";
1+
import {ElementRef, Directive, Input, TemplateRef, ViewContainerRef} from "@angular/core";
22
import {TabView, TabViewItem} from "ui/tab-view";
33

44
@Directive({

‎src/nativescript-angular/dom_adapter.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
1-
import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
2-
import {setRootDomAdapter} from 'angular2/src/platform/dom/dom_adapter';
3-
import {Type} from 'angular2/src/facade/lang';
1+
import {ElementSchemaRegistry} from '@angular/compiler';
2+
import {Parse5DomAdapter} from '@angular/platform-server/src/parse5_adapter';
3+
import {setRootDomAdapter} from '@angular/platform-browser/src/dom/dom_adapter';
4+
import {Type} from '@angular/core/src/facade/lang';
5+
6+
export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
7+
hasProperty(tagName: string, propName: string): boolean {
8+
return true;
9+
}
10+
11+
getMappedPropName(propName: string): string {
12+
return propName;
13+
}
14+
}
415

516
export class NativeScriptDomAdapter extends Parse5DomAdapter {
6-
static makeCurrent() { setRootDomAdapter(new NativeScriptDomAdapter()); }
17+
static makeCurrent() {
18+
console.log("Setting DOM");
19+
setRootDomAdapter(new NativeScriptDomAdapter());
20+
}
721

822
getXHR(): Type {
9-
console.log('getXHR!');
1023
return null;
1124
}
1225

‎src/nativescript-angular/platform-providers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {topmost} from 'ui/frame';
22
import {Page} from 'ui/page';
3-
import {provide, Provider, OpaqueToken} from 'angular2/src/core/di';
3+
import {provide, Provider, OpaqueToken} from '@angular/core/src/di';
44
import {Device, ScreenMetrics, device, screen} from "platform";
55

66
export const APP_ROOT_VIEW = new OpaqueToken('App Root View');

‎src/nativescript-angular/renderer.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import {Inject, Injectable, Optional} from 'angular2/src/core/di';
1+
import {Inject, Injectable, Optional} from '@angular/core/src/di';
22
import {
33
Renderer,
44
RootRenderer,
55
RenderComponentType,
66
RenderDebugInfo
7-
} from 'angular2/src/core/render/api';
7+
} from '@angular/core/src/render/api';
88
import {APP_ROOT_VIEW, DEVICE} from "./platform-providers";
9-
import {isBlank} from 'angular2/src/facade/lang';
10-
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
11-
import {COMPONENT_VARIABLE, CONTENT_ATTR} from 'angular2/src/platform/dom/dom_renderer';
9+
import {isBlank} from '@angular/core/src/facade/lang';
10+
import {CONTENT_ATTR} from '@angular/platform-browser/src/dom/dom_renderer';
1211
import {View} from "ui/core/view";
1312
import * as application from "application";
1413
import {topmost} from 'ui/frame';

‎src/nativescript-angular/router/ns-location-strategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import application = require("application");
2-
import { LocationStrategy } from 'angular2/platform/common';
3-
import { NgZone, ApplicationRef, Inject, forwardRef } from 'angular2/core';
2+
import { LocationStrategy } from '@angular/common';
3+
import { NgZone, ApplicationRef, Inject, forwardRef } from '@angular/core';
44
import { log } from "./common";
55
import { topmost } from "ui/frame";
66

0 commit comments

Comments
 (0)