Skip to content

Commit a8c2c03

Browse files
authored
Merge pull request #378 from NativeScript/amiorkov/angular8-rc
chore: update app's to latest 8 rc version of Angular
2 parents c437776 + 27eb5f7 commit a8c2c03

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

app/common-screens-category/content-screens/content-scrollable/content-scrollable-example.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export class ContentScrollablePageExampleComponent implements OnInit {
1616
public image: Image;
1717
public flex: FlexboxLayout;
1818

19-
@ViewChild("img") img: ElementRef;
20-
@ViewChild("content") content: ElementRef;
19+
@ViewChild("img", { read: ElementRef, static: false }) img: ElementRef;
20+
@ViewChild("content", { read: ElementRef, static: false }) content: ElementRef;
2121

2222
constructor(public page: Page) {
2323
this.page.backgroundSpanUnderStatusBar = true;

app/ng-ui-category/modal-view-ng/sample-modal-view-module-example/modal-view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { DatePicker } from "tns-core-modules/ui/date-picker";
99
})
1010
export class ModalViewComponent implements OnInit {
1111
public currentdate: Date;
12-
@ViewChild("datepicker") datePickerElement: ElementRef;
12+
@ViewChild("datepicker", { read: ElementRef, static: true }) datePickerElement: ElementRef;
1313

1414
constructor(private params: ModalDialogParams) {
1515
this.currentdate = new Date(params.context);

app/ng-ui-widgets-category/web-view/basic-web-view/basic-web-view.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { Label } from "tns-core-modules/ui/label";
1212
export class BasicWebViewComponent implements AfterViewInit {
1313
public webViewSrc: string = "https://docs.nativescript.org/";
1414
public enabled: boolean = false;
15-
@ViewChild("myWebView") webViewRef: ElementRef;
16-
@ViewChild("urlField") urlFieldRef: ElementRef;
17-
@ViewChild("labelResult") labelResultRef: ElementRef;
15+
@ViewChild("myWebView", { read: ElementRef, static: false }) webViewRef: ElementRef;
16+
@ViewChild("urlField", { read: ElementRef, static: false }) urlFieldRef: ElementRef;
17+
@ViewChild("labelResult", { read: ElementRef, static: false }) labelResultRef: ElementRef;
1818

1919
ngAfterViewInit() {
2020
let webview: WebView = this.webViewRef.nativeElement;

app/ng-ui-widgets-category/web-view/events/web-view-events.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class WebViewEventsComponent {
1414
public webViewSrc = "https://docs.nativescript.org/";
1515
public isItemVisible = true;
1616

17-
@ViewChild("webview") webViewElement: ElementRef;
17+
@ViewChild("webview", { read: ElementRef, static: false }) webViewElement: ElementRef;
1818
private firstUrl = "https://google.com/";
1919
private secondUrl = "https://docs.nativescript.org/";
2020

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
}
3030
},
3131
"dependencies": {
32-
"@angular/common": "~7.2.0",
33-
"@angular/compiler": "~7.2.0",
34-
"@angular/core": "~7.2.0",
35-
"@angular/forms": "~7.2.0",
36-
"@angular/http": "~7.2.0",
37-
"@angular/platform-browser": "~7.2.0",
38-
"@angular/platform-browser-dynamic": "~7.2.0",
39-
"@angular/router": "~7.2.0",
32+
"@angular/common": "8.0.0",
33+
"@angular/compiler": "8.0.0",
34+
"@angular/core": "8.0.0",
35+
"@angular/forms": "8.0.0",
36+
"@angular/http": "8.0.0-beta.10",
37+
"@angular/platform-browser": "8.0.0",
38+
"@angular/platform-browser-dynamic": "8.0.0",
39+
"@angular/router": "8.0.0",
4040
"nativescript-angular": "next",
4141
"nativescript-camera": "^4.4.0",
4242
"nativescript-geolocation": "^5.0.0",
@@ -48,8 +48,8 @@
4848
"zone.js": "^0.8.4"
4949
},
5050
"devDependencies": {
51-
"@angular/compiler-cli": "~7.2.0",
52-
"@ngtools/webpack": "~7.2.0",
51+
"@angular/compiler-cli": "8.0.0",
52+
"@ngtools/webpack": "8.0.0",
5353
"codelyzer": "^3.0.1",
5454
"fs-extra": "^0.30.0",
5555
"glob": "^7.1.3",
@@ -62,7 +62,7 @@
6262
"tar.gz": "^1.0.5",
6363
"tns-platform-declarations": "next",
6464
"tslint": "^5.11.0",
65-
"typescript": "~3.1.1"
65+
"typescript": "~3.4.5"
6666
},
6767
"scripts": {
6868
"pretsc": "npm install",

0 commit comments

Comments
 (0)