Skip to content

Commit 48654ed

Browse files
committed
Merge pull request #213 from NativeScript/hdeshev/angular-rc0
Upgrade to Angular RC0
2 parents c1b20e5 + 09c0641 commit 48654ed

Some content is hidden

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

55 files changed

+252
-171
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: android
22

3+
jdk:
4+
- oraclejdk8
5+
36
android:
47
components:
58
- platform-tools

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 { }

0 commit comments

Comments
 (0)