Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 52d7f4e

Browse files
committed
feat: upgrade to Angular 8 #1386
1 parent 324a675 commit 52d7f4e

18 files changed

+7003
-7362
lines changed

DEVELOPER.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Node.js and npm are essential to Angular development.
66

77
[Get it now](https://docs.npmjs.com/getting-started/installing-node) if it's not already installed on your machine.
88

9-
**Verify that you are running at least node `v4.x.x` and npm `3.x.x`**
9+
**Verify that you are running at least node `v10.x.x` and npm `6.x.x`**
1010
by running `node -v` and `npm -v` in a terminal/console window.
1111
Older versions produce errors.
1212

demo/package-lock.json

Lines changed: 3043 additions & 3730 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/package.json

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-datatables-demo",
3-
"version": "7.0.1-dev",
3+
"version": "8.0.0-dev",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",
@@ -12,64 +12,64 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^7.0.1",
16-
"@angular/common": "^7.0.1",
17-
"@angular/compiler": "^7.0.1",
18-
"@angular/core": "^7.0.1",
19-
"@angular/forms": "^7.0.1",
20-
"@angular/http": "^7.0.1",
21-
"@angular/platform-browser": "^7.0.1",
22-
"@angular/platform-browser-dynamic": "^7.0.1",
23-
"@angular/router": "^7.0.1",
15+
"@angular/animations": "^8.0.0",
16+
"@angular/common": "^8.0.0",
17+
"@angular/compiler": "^8.0.0",
18+
"@angular/core": "^8.0.0",
19+
"@angular/forms": "^8.0.0",
20+
"@angular/http": "^7.2.15",
21+
"@angular/platform-browser": "^8.0.0",
22+
"@angular/platform-browser-dynamic": "^8.0.0",
23+
"@angular/router": "^8.0.0",
2424
"angular-datatables": "^7.0.0",
2525
"angular2-highlight-js": "^6.0.1-alpha",
26-
"core-js": "^2.5.4",
27-
"datatables.net": "^1.10.16",
28-
"datatables.net-buttons": "^1.4.2",
29-
"datatables.net-buttons-dt": "^1.4.2",
30-
"datatables.net-colreorder": "^1.4.1",
31-
"datatables.net-colreorder-dt": "^1.4.1",
32-
"datatables.net-dt": "^1.10.16",
33-
"datatables.net-responsive": "^2.2.0",
34-
"datatables.net-responsive-dt": "^2.2.0",
35-
"datatables.net-scroller": "^1.4.3",
36-
"datatables.net-select": "^1.2.3",
37-
"datatables.net-select-dt": "^1.2.3",
38-
"highlight.js": "^9.12.0",
39-
"jquery": "^3.2.1",
40-
"jszip": "^3.1.5",
26+
"core-js": "^3.1.3",
27+
"datatables.net": "^1.10.19",
28+
"datatables.net-buttons": "^1.5.6",
29+
"datatables.net-buttons-dt": "^1.5.6",
30+
"datatables.net-colreorder": "^1.5.1",
31+
"datatables.net-colreorder-dt": "^1.5.1",
32+
"datatables.net-dt": "^1.10.19",
33+
"datatables.net-responsive": "^2.2.3",
34+
"datatables.net-responsive-dt": "^2.2.3",
35+
"datatables.net-scroller": "^2.0.0",
36+
"datatables.net-select": "^1.3.0",
37+
"datatables.net-select-dt": "^1.3.0",
38+
"highlight.js": "^9.15.8",
39+
"jquery": "^3.4.1",
40+
"jszip": "^3.2.1",
4141
"materialize-css": "0.100.2",
42-
"rxjs": "^6.3.3",
43-
"rxjs-compat": "^6.1.0",
44-
"tether": "^1.4.0",
42+
"rxjs": "^6.5.2",
43+
"rxjs-compat": "^6.5.2",
44+
"tether": "^1.4.6",
4545
"ts-helpers": "^1.1.2",
46-
"zone.js": "^0.8.26"
46+
"zone.js": "^0.9.1"
4747
},
4848
"devDependencies": {
49-
"@angular/cli": "^7.0.3",
50-
"@angular/compiler-cli": "^7.0.1",
51-
"@angular/language-service": "^7.0.1",
52-
"@angular-devkit/build-angular": "~0.10.3",
53-
"@types/datatables.net": "^1.10.6",
54-
"@types/datatables.net-buttons": "^1.1.4",
55-
"@types/datatables.net-select": "^1.2.2",
56-
"@types/jasmine": "~2.8.7",
57-
"@types/jasminewd2": "~2.0.3",
58-
"@types/jquery": "~3.3.22",
59-
"@types/node": "~10.12.0",
60-
"chalk": "~2.4.1",
61-
"codelyzer": "^4.0.1",
62-
"jasmine-core": "~3.3.0",
49+
"@angular/cli": "^8.0.2",
50+
"@angular/compiler-cli": "^8.0.0",
51+
"@angular/language-service": "^8.0.0",
52+
"@angular-devkit/build-angular": "~0.800.2",
53+
"@types/datatables.net": "^1.10.17",
54+
"@types/datatables.net-buttons": "^1.4.2",
55+
"@types/datatables.net-select": "^1.2.5",
56+
"@types/jasmine": "~3.3.13",
57+
"@types/jasminewd2": "~2.0.6",
58+
"@types/jquery": "~3.3.29",
59+
"@types/node": "~12.0.7",
60+
"chalk": "~2.4.2",
61+
"codelyzer": "^5.1.0",
62+
"jasmine-core": "~3.4.0",
6363
"jasmine-spec-reporter": "~4.2.1",
64-
"karma": "~3.1.1",
64+
"karma": "~4.1.0",
6565
"karma-chrome-launcher": "~2.2.0",
66-
"karma-coverage-istanbul-reporter": "^2.0.4",
67-
"karma-jasmine": "~1.1.1",
68-
"karma-jasmine-html-reporter": "^1.3.1",
69-
"protractor": "~5.4.1",
70-
"ts-node": "~7.0.1",
71-
"tslint": "~5.11.0",
72-
"typescript": "~3.1.3"
66+
"karma-coverage-istanbul-reporter": "^2.0.5",
67+
"karma-jasmine": "~2.0.1",
68+
"karma-jasmine-html-reporter": "^1.4.2",
69+
"protractor": "~5.4.2",
70+
"ts-node": "~8.2.0",
71+
"tslint": "~5.17.0",
72+
"typescript": "~3.4.5"
7373
},
7474
"engines": {
7575
"node": ">=8.9.0"

demo/src/app/advanced/custom-range-search-snippet.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { DataTableDirective } from 'angular-datatables';
4444
templateUrl: 'custom-range-search.component.html'
4545
})
4646
export class CustomRangeSearchComponent implements OnDestroy, OnInit {
47-
@ViewChild(DataTableDirective)
47+
@ViewChild(DataTableDirective, {static: false})
4848
datatableElement: DataTableDirective;
4949
min: number;
5050
max: number;

demo/src/app/advanced/custom-range-search.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { DataTableDirective } from 'angular-datatables';
88
templateUrl: 'custom-range-search.component.html'
99
})
1010
export class CustomRangeSearchComponent implements OnDestroy, OnInit {
11-
@ViewChild(DataTableDirective)
11+
@ViewChild(DataTableDirective, {static: false})
1212
datatableElement: DataTableDirective;
1313
min: number;
1414
max: number;
@@ -50,9 +50,10 @@ export class CustomRangeSearchComponent implements OnDestroy, OnInit {
5050
$.fn['dataTable'].ext.search.pop();
5151
}
5252

53-
filterById(): void {
53+
filterById(): boolean {
5454
this.datatableElement.dtInstance.then((dtInstance: DataTables.Api) => {
5555
dtInstance.draw();
5656
});
57+
return false;
5758
}
5859
}

demo/src/app/advanced/dt-instance-snippet.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import { DataTableDirective } from 'angular-datatables';
4343
templateUrl: 'dt-instance.component.html'
4444
})
4545
export class DtInstanceComponent implements OnInit {
46-
@ViewChild(DataTableDirective)
46+
@ViewChild(DataTableDirective, {static: false})
4747
private datatableElement: DataTableDirective;
4848
4949
dtOptions: DataTables.Settings = {};

demo/src/app/advanced/dt-instance.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { DataTableDirective } from 'angular-datatables';
77
templateUrl: 'dt-instance.component.html'
88
})
99
export class DtInstanceComponent implements OnInit {
10-
@ViewChild(DataTableDirective)
10+
@ViewChild(DataTableDirective, {static: false})
1111
datatableElement: DataTableDirective;
1212

1313
dtOptions: DataTables.Settings = {};

demo/src/app/advanced/individual-column-filtering-snippet.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { DataTableDirective } from 'angular-datatables';
3939
templateUrl: 'individual-column-filtering.component.html'
4040
})
4141
export class IndividualColumnFilteringComponent implements OnInit, AfterViewInit {
42-
@ViewChild(DataTableDirective)
42+
@ViewChild(DataTableDirective, {static: false})
4343
datatableElement: DataTableDirective;
4444
4545
dtOptions: DataTables.Settings = {};

demo/src/app/advanced/individual-column-filtering.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { DataTableDirective } from 'angular-datatables';
77
templateUrl: 'individual-column-filtering.component.html'
88
})
99
export class IndividualColumnFilteringComponent implements OnInit, AfterViewInit {
10-
@ViewChild(DataTableDirective)
10+
@ViewChild(DataTableDirective, {static: false})
1111
datatableElement: DataTableDirective;
1212

1313
dtOptions: DataTables.Settings = {};

demo/src/app/advanced/rerender-snippet.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { Subject } from 'rxjs';
3636
templateUrl: 'rerender.component.html'
3737
})
3838
export class RerenderComponent implements AfterViewInit, OnDestroy, OnInit {
39-
@ViewChild(DataTableDirective)
39+
@ViewChild(DataTableDirective, {static: false})
4040
dtElement: DataTableDirective;
4141
4242
dtOptions: DataTables.Settings = {};

0 commit comments

Comments
 (0)