Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b765e02

Browse files
chore: angular 9 cleanup (#2188)
1 parent 4ae759b commit b765e02

Some content is hidden

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

52 files changed

+249
-201
lines changed

‎e2e/animation-examples/app/app.module.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import {
55
APP_INITIALIZER
66
} from "@angular/core";
77

8-
import { NativeScriptModule } from "@nativescript/angular";
9-
import { NativeScriptAnimationsModule } from "@nativescript/angular/animations";
10-
import { NSModuleFactoryLoader } from "@nativescript/angular/router";
8+
import { NativeScriptModule, NativeScriptAnimationsModule } from "@nativescript/angular";
119

1210
import { AppRoutingModule } from "./app.routing";
1311
import { AnimationsListComponent } from "./animations-list.component";

‎e2e/animation-examples/app/selector-all.component.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
transition,
66
trigger,
77
} from "@angular/animations";
8-
import { Component } from "@angular/core";
8+
import { Component,NgZone } from "@angular/core";
99

1010
@Component({
1111
moduleId: module.id,
@@ -31,7 +31,7 @@ import { Component } from "@angular/core";
3131
template: `
3232
<FlexboxLayout flexDirection="column"
3333
automationText="itemsContainer">
34-
<Button text="add" automationText="add" (tap)="items.push('random')"></Button>
34+
<Button text="add" automationText="add" (tap)="addRandom()"></Button>
3535
3636
<FlexboxLayout
3737
flexDirection="column"
@@ -54,11 +54,19 @@ export class SelectorAllComponent {
5454
"second",
5555
];
5656

57+
constructor(private zone: NgZone) {}
58+
5759
add() {
5860
const newItem = `Item ${this.items.length}`;
5961
this.items.push(newItem);
6062
}
6163

64+
addRandom() {
65+
// this.zone.run(() => {
66+
this.items.push('random');
67+
// });
68+
}
69+
6270
remove(item) {
6371
const index = this.items.indexOf(item);
6472
this.items.splice(index, 1)

‎e2e/animation-examples/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"typescript": "~3.8.3"
4848
},
4949
"scripts": {
50-
"clean": "npx rimraf hooks node_modules package-lock.json",
50+
"clean": "npx rimraf hooks node_modules platforms package-lock.json",
5151
"setup": "cd ../../nativescript-angular && npm run pack && cd ../e2e/animation-examples && npm run clean",
5252
"u": "update-ns-webpack",
5353
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
@@ -56,6 +56,8 @@
5656
"ns-verify-bundle": "ns-verify-bundle",
5757
"update-ns-webpack": "update-ns-webpack",
5858
"ngcc": "ngcc --properties es2015 module main --first-only",
59-
"postinstall": "npm run ngcc"
59+
"postinstall": "npm run ngcc",
60+
"ios": "tns debug ios --env.aot --emulator --no-hmr",
61+
"android": "tns debug android --env.aot --emulator --no-hmr"
6062
}
6163
}

‎e2e/modal-navigation-ng/app/app.routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from "@angular/core";
2-
import { NativeScriptRouterModule } from "@nativescript/angular/router";
2+
import { NativeScriptRouterModule } from "@nativescript/angular";
33
import { Routes, Router } from "@angular/router";
44

55
import { HomeComponent } from "./home/home.component";

‎e2e/modal-navigation-ng/app/home/home.component.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component, ViewContainerRef } from "@angular/core";
2-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
3-
import { RouterExtensions } from "@nativescript/angular/router";
4-
import { EventData } from "@nativescript/core/data/observable";
2+
import { ModalDialogService, ModalDialogOptions, RouterExtensions } from "@nativescript/angular";
3+
import { EventData } from "@nativescript/core";
54

65
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
76
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";

‎e2e/modal-navigation-ng/app/layout.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
33
import { NSLocationStrategy } from "@nativescript/angular";
4-
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
4+
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular";
55
import { ModalViewComponent } from "./modal-shared/modal-view.component";
66
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
77
import { AppModule } from "./app.module";

‎e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from "@angular/core";
22
import { View, ShownModallyData } from "@nativescript/core/ui/core/view"
3-
import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
3+
import { ModalDialogParams } from "@nativescript/angular";
44

55
@Component({
66
moduleId: module.id,

‎e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from "@angular/core";
22
import { View } from "@nativescript/core/ui/core/view"
33
import { ActivatedRoute } from "@angular/router";
4-
import { RouterExtensions } from "@nativescript/angular/router";
4+
import { RouterExtensions } from "@nativescript/angular";
55

66
@Component({
77
moduleId: module.id,

‎e2e/modal-navigation-ng/app/modal-shared/modal-shared-second.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component } from "@angular/core";
2-
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular/modal-dialog";
2+
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular";
33

44
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
55
import { ModalViewComponent } from "../modal-shared/modal-view.component";
6-
import { RouterExtensions } from "@nativescript/angular/router";
6+
import { RouterExtensions } from "@nativescript/angular";
77

88
@Component({
99
selector: "ns-second",

‎e2e/modal-navigation-ng/app/modal-shared/modal-view-content.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from "@angular/core";
2-
import { ModalDialogParams } from "@nativescript/angular/modal-dialog";
2+
import { ModalDialogParams } from "@nativescript/angular";
33

44
@Component({
55
selector: "ModalViewContent",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /