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

Commit d1558a8

Browse files
l-linl-lin
committed
feat: Support Angular 5
1 parent 9e7b0ba commit d1558a8

18 files changed

+1419
-1404
lines changed

‎demo/.angular-cli.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,16 @@
5656
},
5757
"lint": [
5858
{
59-
"project": "src/tsconfig.app.json"
59+
"project": "src/tsconfig.app.json",
60+
"exclude": "**/node_modules/**"
6061
},
6162
{
62-
"project": "src/tsconfig.spec.json"
63+
"project": "src/tsconfig.spec.json",
64+
"exclude": "**/node_modules/**"
6365
},
6466
{
65-
"project": "e2e/tsconfig.e2e.json"
67+
"project": "e2e/tsconfig.e2e.json",
68+
"exclude": "**/node_modules/**"
6669
}
6770
],
6871
"test": {

‎demo/package-lock.json

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

‎demo/package.json

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,49 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "4.4.6",
16-
"@angular/common": "4.4.6",
17-
"@angular/compiler": "4.4.6",
18-
"@angular/core": "4.4.6",
19-
"@angular/forms": "4.4.6",
20-
"@angular/http": "4.4.6",
21-
"@angular/platform-browser": "4.4.6",
22-
"@angular/platform-browser-dynamic": "4.4.6",
23-
"@angular/router": "4.4.6",
15+
"@angular/animations": "^5.0.0",
16+
"@angular/common": "^5.0.0",
17+
"@angular/compiler": "^5.0.0",
18+
"@angular/core": "^5.0.0",
19+
"@angular/forms": "^5.0.0",
20+
"@angular/http": "^5.0.0",
21+
"@angular/platform-browser": "^5.0.0",
22+
"@angular/platform-browser-dynamic": "^5.0.0",
23+
"@angular/router": "^5.0.0",
2424
"angular-datatables": "4.4.1",
25-
"angular2-highlight-js": "5.0.0",
26-
"core-js": "~2.4.1",
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",
25+
"angular2-highlight-js": "^5.0.0",
26+
"core-js": "^2.4.1",
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",
3333
"datatables.net-responsive": "^2.2.0",
3434
"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",
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",
4040
"materialize-css": "0.98.0",
41-
"rxjs": "5.4.3",
42-
"tether": "1.4.0",
43-
"ts-helpers": "1.1.2",
44-
"zone.js": "0.8.17"
41+
"rxjs": "^5.5.2",
42+
"tether": "^1.4.0",
43+
"ts-helpers": "^1.1.2",
44+
"zone.js": "^0.8.18"
4545
},
4646
"devDependencies": {
47-
"@angular/cli": "1.4.9",
48-
"@angular/compiler-cli": "4.4.6",
49-
"@angular/language-service": "4.4.6",
50-
"@types/datatables.net": "~1.10.6",
51-
"@types/datatables.net-buttons": "~1.1.4",
52-
"@types/datatables.net-select": "~1.2.2",
53-
"@types/jasmine": "2.6.0",
54-
"@types/jasminewd2": "2.0.3",
47+
"@angular/cli": "1.5.3",
48+
"@angular/compiler-cli": "^5.0.0",
49+
"@angular/language-service": "^5.0.0",
50+
"@types/datatables.net": "^1.10.6",
51+
"@types/datatables.net-buttons": "^1.1.4",
52+
"@types/datatables.net-select": "^1.2.2",
53+
"@types/jasmine": "~2.6.0",
54+
"@types/jasminewd2": "~2.0.3",
5555
"@types/jquery": "~3.2.12",
5656
"@types/node": "~6.0.70",
57-
"codelyzer": "~3.2.0",
57+
"codelyzer": "^4.0.1",
5858
"jasmine-core": "~2.6.2",
5959
"jasmine-spec-reporter": "~4.1.0",
6060
"karma": "~1.7.0",
@@ -66,7 +66,6 @@
6666
"protractor": "~5.1.2",
6767
"ts-node": "~3.3.0",
6868
"tslint": "~5.7.0",
69-
"typescript": "~2.3.3",
70-
"webpack": "~3.5.6"
69+
"typescript": "~2.4.2"
7170
}
7271
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class IndividualColumnFilteringComponent implements OnInit, AfterViewInit
6363
ngAfterViewInit(): void {
6464
this.datatableElement.dtInstance.then((dtInstance: DataTables.Api) => {
6565
dtInstance.columns().every(function () {
66-
var that = this;
66+
const that = this;
6767
$('input', this.footer()).on('keyup change', function () {
6868
if (that.search() !== this['value']) {
6969
that

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class IndividualColumnFilteringComponent implements OnInit, AfterViewInit
3131
ngAfterViewInit(): void {
3232
this.datatableElement.dtInstance.then((dtInstance: DataTables.Api) => {
3333
dtInstance.columns().every(function () {
34-
var that = this;
34+
const that = this;
3535
$('input', this.footer()).on('keyup change', function () {
3636
if (that.search() !== this['value']) {
3737
that

‎demo/src/app/advanced/load-dt-options-with-promise-snippet.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ import { Http } from '@angular/http';
3232
import 'rxjs/add/operator/toPromise';
3333
3434
@Component({
35-
selector: 'load-dt-options-with-promise',
35+
selector: 'app-load-dt-options-with-promise',
3636
templateUrl: 'load-dt-options-with-promise.component.html'
3737
})
3838
export class LoadDtOptionsWithPromiseComponent implements OnInit {
39-
dtOptions: DataTables.Settings = {};
39+
dtOptions: Promise<DataTables.Settings>;
4040
4141
constructor(@Inject(Http) private http: Http) {}
4242
4343
ngOnInit(): void {
4444
this.dtOptions = this.http.get('data/dtOptions.json')
45-
.toPromise()
46-
.then(response => response.json())
47-
.catch(this.handleError);
45+
.toPromise()
46+
.then((response) => response.json())
47+
.catch(this.handleError);
4848
}
4949
50-
private handleError(error: any): Promise<any> {
50+
private handleError(error: any): Promise&lt;any&gt; {
5151
console.error('An error occurred', error); // for demo purposes only
5252
return Promise.reject(error.message || error);
5353
}

‎demo/src/app/advanced/load-dt-options-with-promise.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import 'rxjs/add/operator/toPromise';
88
templateUrl: 'load-dt-options-with-promise.component.html'
99
})
1010
export class LoadDtOptionsWithPromiseComponent implements OnInit {
11-
dtOptions: DataTables.Settings = {};
11+
dtOptions: Promise<DataTables.Settings>;
1212

13-
constructor( @Inject(Http) private http: Http) { }
13+
constructor(@Inject(Http) private http: Http) {}
1414

1515
ngOnInit(): void {
1616
this.dtOptions = this.http.get('data/dtOptions.json')
1717
.toPromise()
18-
.then(response => response.json())
18+
.then((response) => response.json())
1919
.catch(this.handleError);
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class RerenderSnippetComponent {
2929
<pre>
3030
<code class="typescript highlight">import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
3131
import { DataTableDirective } from 'angular-datatables';
32-
import { Subject } from 'rxjs/Rx';
32+
import { Subject } from 'rxjs/Subject';
3333
3434
@Component({
3535
selector: 'app-rerender',
@@ -41,7 +41,7 @@ export class RerenderComponent implements OnInit, AfterViewInit {
4141
4242
dtOptions: DataTables.Settings = {};
4343
44-
dtTrigger: Subject<any> = new Subject();
44+
dtTrigger: Subject&lt;any&gt; = new Subject();
4545
4646
ngOnInit(): void {
4747
this.dtOptions = {

‎demo/src/app/advanced/rerender.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
22
import { DataTableDirective } from 'angular-datatables';
3-
import { Subject } from 'rxjs/Rx';
3+
import { Subject } from 'rxjs/Subject';
44

55
@Component({
66
selector: 'app-rerender',

‎demo/src/app/basic/angular-way-snippet.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AngularWaySnippetComponent {
3939
<pre>
4040
<code class="typescript highlight">import { Component, OnInit } from '@angular/core';
4141
import { Http, Response } from '@angular/http';
42-
import { Subject } from 'rxjs/Rx';
42+
import { Subject } from 'rxjs/Subject';
4343
4444
import 'rxjs/add/operator/map';
4545
@@ -58,7 +58,7 @@ export class AngularWayComponent implements OnInit {
5858
persons: Person[] = [];
5959
// We use this trigger because fetching the list of persons can be quite long,
6060
// thus we ensure the data is fetched before rendering
61-
dtTrigger: Subject<any> = new Subject();
61+
dtTrigger: Subject&lt;any&gt; = new Subject();
6262
6363
constructor(private http: Http) { }
6464

‎demo/src/app/basic/angular-way.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit } from '@angular/core';
22
import { Http, Response } from '@angular/http';
3-
import { Subject } from 'rxjs/Rx';
3+
import { Subject } from 'rxjs/Subject';
44

55
import 'rxjs/add/operator/map';
66

‎demo/tslint.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"forin": true,
1616
"import-blacklist": [
1717
true,
18-
"rxjs"
18+
"rxjs",
19+
"rxjs/Rx"
1920
],
2021
"import-spacing": true,
2122
"indent": [
@@ -31,8 +32,14 @@
3132
"member-access": false,
3233
"member-ordering": [
3334
true,
34-
"static-before-instance",
35-
"variables-before-functions"
35+
{
36+
"order": [
37+
"static-field",
38+
"instance-field",
39+
"static-method",
40+
"instance-method"
41+
]
42+
}
3643
],
3744
"no-arg": true,
3845
"no-bitwise": true,
@@ -80,6 +87,7 @@
8087
],
8188
"radix": true,
8289
"semicolon": [
90+
true,
8391
"always"
8492
],
8593
"triple-equals": [
@@ -119,6 +127,8 @@
119127
"app",
120128
"kebab-case"
121129
],
130+
"angular-whitespace": [true, "check-interpolation"],
131+
"no-output-on-prefix": true,
122132
"use-input-property-decorator": true,
123133
"use-output-property-decorator": true,
124134
"use-host-property-decorator": true,
@@ -127,9 +137,6 @@
127137
"use-life-cycle-interface": true,
128138
"use-pipe-transform-interface": true,
129139
"component-class-suffix": true,
130-
"directive-class-suffix": true,
131-
"no-access-missing-member": true,
132-
"templates-use-public": true,
133-
"invoke-injectable": true
140+
"directive-class-suffix": true
134141
}
135142
}

0 commit comments

Comments
 (0)