Skip to content

Commit eab2e55

Browse files
author
Anthony Dresser
authored
Angular 4 (#15)
* upgrade to angular4 * upgraded to angular4, test application does not break
1 parent 8ff7d43 commit eab2e55

12 files changed

+134
-124
lines changed

‎components/js/gridsync.service.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ export declare class GridSyncService {
1616
openTypeDropdown(columnIndex: number): void;
1717
private setColumnWidthPX(index, widthPX);
1818
underlyingSelectionModel: any;
19-
updated: Observable<string>;
20-
typeDropdownOffset: Observable<[number, number]>;
19+
readonly updated: Observable<string>;
20+
readonly typeDropdownOffset: Observable<[number, number]>;
2121
scrollLeftPX: number;
2222
scrollBarWidthPX: number;
2323
columnWidthPXs: number[];
2424
rowNumberColumnWidthPX: number;
25-
selectionModel: SelectionModel;
25+
readonly selectionModel: SelectionModel;
2626
isGridReadOnly: boolean;
2727
private notifyUpdates(propertyName);
2828
}

‎components/js/gridsync.service.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
55
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
66
return c > 3 && r && Object.defineProperty(target, key, r), r;
77
};
8-
var __metadata = (this && this.__metadata) || function (k, v) {
9-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10-
};
8+
Object.defineProperty(exports, "__esModule", { value: true });
119
/*---------------------------------------------------------------------------------------------
1210
* Copyright (c) Microsoft Corporation. All rights reserved.
1311
* Licensed under the MIT License. See License.txt in the project root for license information.
1412
*--------------------------------------------------------------------------------------------*/
15-
const core_1 = require('@angular/core');
16-
const Rx_1 = require('rxjs/Rx');
17-
const selectionmodel_1 = require('./selectionmodel');
13+
const core_1 = require("@angular/core");
14+
const Rx_1 = require("rxjs/Rx");
15+
const selectionmodel_1 = require("./selectionmodel");
1816
let GridSyncService = class GridSyncService {
1917
constructor() {
2018
this.columnMinWidthPX = 30;
@@ -106,7 +104,6 @@ let GridSyncService = class GridSyncService {
106104
}
107105
};
108106
GridSyncService = __decorate([
109-
core_1.Injectable(),
110-
__metadata('design:paramtypes', [])
107+
core_1.Injectable()
111108
], GridSyncService);
112109
exports.GridSyncService = GridSyncService;

‎components/js/interfaces.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export declare class CancellationToken {
2323
private _isCanceled;
2424
private _canceled;
2525
cancel(): void;
26-
isCanceled: boolean;
27-
canceled: Observable<any>;
26+
readonly isCanceled: boolean;
27+
readonly canceled: Observable<any>;
2828
}
2929
export declare enum FieldType {
3030
String = 0,

‎components/js/interfaces.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
/*---------------------------------------------------------------------------------------------
34
* Copyright (c) Microsoft Corporation. All rights reserved.
45
* Licensed under the MIT License. See License.txt in the project root for license information.
56
*--------------------------------------------------------------------------------------------*/
6-
const Rx_1 = require('rxjs/Rx');
7+
const Rx_1 = require("rxjs/Rx");
8+
var NotificationType;
79
(function (NotificationType) {
810
NotificationType[NotificationType["Error"] = 0] = "Error";
911
NotificationType[NotificationType["UpdateAvailable"] = 1] = "UpdateAvailable";
1012
NotificationType[NotificationType["UpdateDownloaded"] = 2] = "UpdateDownloaded";
11-
})(exports.NotificationType || (exports.NotificationType = {}));
12-
var NotificationType = exports.NotificationType;
13+
})(NotificationType = exports.NotificationType || (exports.NotificationType = {}));
14+
var CollectionChange;
1315
(function (CollectionChange) {
1416
CollectionChange[CollectionChange["ItemsReplaced"] = 0] = "ItemsReplaced";
15-
})(exports.CollectionChange || (exports.CollectionChange = {}));
16-
var CollectionChange = exports.CollectionChange;
17+
})(CollectionChange = exports.CollectionChange || (exports.CollectionChange = {}));
1718
class CancellationToken {
1819
constructor() {
1920
this._isCanceled = false;
@@ -31,12 +32,12 @@ class CancellationToken {
3132
}
3233
}
3334
exports.CancellationToken = CancellationToken;
35+
var FieldType;
3436
(function (FieldType) {
3537
FieldType[FieldType["String"] = 0] = "String";
3638
FieldType[FieldType["Boolean"] = 1] = "Boolean";
3739
FieldType[FieldType["Integer"] = 2] = "Integer";
3840
FieldType[FieldType["Decimal"] = 3] = "Decimal";
3941
FieldType[FieldType["Date"] = 4] = "Date";
4042
FieldType[FieldType["Unknown"] = 5] = "Unknown";
41-
})(exports.FieldType || (exports.FieldType = {}));
42-
var FieldType = exports.FieldType;
43+
})(FieldType = exports.FieldType || (exports.FieldType = {}));

‎components/js/selectionmodel.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export declare class SelectionModel implements ISlickSelectionModel {
55
private _onSelectedRangesChanged;
66
private _slickRangeFactory;
77
constructor(_rowSelectionModel: ISlickSelectionModel, _handler: ISlickEventHandler, _onSelectedRangesChanged: ISlickEvent, _slickRangeFactory: (fromRow: number, fromCell: number, toRow: number, toCell: number) => ISlickRange);
8-
range: ISlickRange[];
9-
onSelectedRangesChanged: ISlickEvent;
8+
readonly range: ISlickRange[];
9+
readonly onSelectedRangesChanged: ISlickEvent;
1010
init(grid: ISlickGrid): void;
1111
destroy(): void;
1212
setSelectedRanges(ranges: ISlickRange[]): void;
@@ -23,7 +23,7 @@ export declare class SelectionModel implements ISlickSelectionModel {
2323
private static areRangesIdentical(lhs, rhs);
2424
private getColumnRange(columnId);
2525
private getColumnRangeByIndex(columnIndex);
26-
private isColumnSelectionCurrently;
26+
private readonly isColumnSelectionCurrently;
2727
private updateSelectedRanges(ranges);
2828
}
2929
export interface ISlickSelectionModel {

‎components/js/selectionmodel.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
class SelectionModel {
34
constructor(_rowSelectionModel, _handler, _onSelectedRangesChanged, _slickRangeFactory) {
45
this._rowSelectionModel = _rowSelectionModel;

‎components/js/slickgrid.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export declare class SlickGrid implements OnChanges, OnInit, OnDestroy, AfterVie
6666
ngOnDestroy(): void;
6767
enterEditSession(): void;
6868
endEditSession(): void;
69-
onSelectedRowsChanged: ISlickEvent;
69+
readonly onSelectedRowsChanged: ISlickEvent;
7070
getSelectedRows(): number[];
7171
getColumnIndex(name: string): number;
7272
getSelectedRanges(): ISlickRange[];

‎components/js/slickgrid.js

+65-65
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
"use strict";
12
/*---------------------------------------------------------------------------------------------
23
* Copyright (c) Microsoft Corporation. All rights reserved.
34
* Licensed under the MIT License. See License.txt in the project root for license information.
45
*--------------------------------------------------------------------------------------------*/
5-
"use strict";
66
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
77
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
88
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -15,10 +15,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
var __param = (this && this.__param) || function (paramIndex, decorator) {
1616
return function (target, key) { decorator(target, key, paramIndex); }
1717
};
18-
const core_1 = require('@angular/core');
19-
const Rx_1 = require('rxjs/Rx');
20-
const interfaces_1 = require('./interfaces');
21-
const gridsync_service_1 = require('./gridsync.service');
18+
Object.defineProperty(exports, "__esModule", { value: true });
19+
const core_1 = require("@angular/core");
20+
const Rx_1 = require("rxjs/Rx");
21+
const interfaces_1 = require("./interfaces");
22+
const gridsync_service_1 = require("./gridsync.service");
2223
////////// Text Editors ///////////////////////////////////////////////////////
2324
function getOverridableTextEditorClass(grid) {
2425
class OverridableTextEditor {
@@ -87,7 +88,6 @@ function getOverridableTextEditorClass(grid) {
8788
return OverridableTextEditor;
8889
}
8990
////////// Implementation /////////////////////////////////////////////////////
90-
let SlickGrid_1;
9191
let SlickGrid = SlickGrid_1 = class SlickGrid {
9292
/* andresse: commented out 11/1/2016 due to minification issues
9393
private _finishGridEditingFn: (e: any, args: any) => void;
@@ -594,114 +594,114 @@ let SlickGrid = SlickGrid_1 = class SlickGrid {
594594
}
595595
};
596596
__decorate([
597-
core_1.Input(),
598-
__metadata('design:type', Array)
597+
core_1.Input(),
598+
__metadata("design:type", Array)
599599
], SlickGrid.prototype, "columnDefinitions", void 0);
600600
__decorate([
601-
core_1.Input(),
602-
__metadata('design:type', Object)
601+
core_1.Input(),
602+
__metadata("design:type", Object)
603603
], SlickGrid.prototype, "dataRows", void 0);
604604
__decorate([
605-
core_1.Input(),
606-
__metadata('design:type', Rx_1.Observable)
605+
core_1.Input(),
606+
__metadata("design:type", Rx_1.Observable)
607607
], SlickGrid.prototype, "resized", void 0);
608608
__decorate([
609-
core_1.Input(),
610-
__metadata('design:type', Array)
609+
core_1.Input(),
610+
__metadata("design:type", Array)
611611
], SlickGrid.prototype, "highlightedCells", void 0);
612612
__decorate([
613-
core_1.Input(),
614-
__metadata('design:type', Array)
613+
core_1.Input(),
614+
__metadata("design:type", Array)
615615
], SlickGrid.prototype, "blurredColumns", void 0);
616616
__decorate([
617-
core_1.Input(),
618-
__metadata('design:type', Array)
617+
core_1.Input(),
618+
__metadata("design:type", Array)
619619
], SlickGrid.prototype, "contextColumns", void 0);
620620
__decorate([
621-
core_1.Input(),
622-
__metadata('design:type', Array)
621+
core_1.Input(),
622+
__metadata("design:type", Array)
623623
], SlickGrid.prototype, "columnsLoading", void 0);
624624
__decorate([
625-
core_1.Input(),
626-
__metadata('design:type', Boolean)
625+
core_1.Input(),
626+
__metadata("design:type", Boolean)
627627
], SlickGrid.prototype, "showHeader", void 0);
628628
__decorate([
629-
core_1.Input(),
630-
__metadata('design:type', Boolean)
629+
core_1.Input(),
630+
__metadata("design:type", Boolean)
631631
], SlickGrid.prototype, "showDataTypeIcon", void 0);
632632
__decorate([
633-
core_1.Input(),
634-
__metadata('design:type', Boolean)
633+
core_1.Input(),
634+
__metadata("design:type", Boolean)
635635
], SlickGrid.prototype, "enableColumnReorder", void 0);
636636
__decorate([
637-
core_1.Input(),
638-
__metadata('design:type', Boolean)
637+
core_1.Input(),
638+
__metadata("design:type", Boolean)
639639
], SlickGrid.prototype, "enableAsyncPostRender", void 0);
640640
__decorate([
641-
core_1.Input(),
642-
__metadata('design:type', String)
641+
core_1.Input(),
642+
__metadata("design:type", String)
643643
], SlickGrid.prototype, "selectionModel", void 0);
644644
__decorate([
645-
core_1.Input(),
646-
__metadata('design:type', Array)
645+
core_1.Input(),
646+
__metadata("design:type", Array)
647647
], SlickGrid.prototype, "plugins", void 0);
648648
__decorate([
649-
core_1.Input(),
650-
__metadata('design:type', Boolean)
649+
core_1.Input(),
650+
__metadata("design:type", Boolean)
651651
], SlickGrid.prototype, "enableEditing", void 0);
652652
__decorate([
653-
core_1.Input(),
654-
__metadata('design:type', Number)
653+
core_1.Input(),
654+
__metadata("design:type", Number)
655655
], SlickGrid.prototype, "topRowNumber", void 0);
656656
__decorate([
657-
core_1.Input(),
658-
__metadata('design:type', Function)
657+
core_1.Input(),
658+
__metadata("design:type", Function)
659659
], SlickGrid.prototype, "overrideCellFn", void 0);
660660
__decorate([
661-
core_1.Input(),
662-
__metadata('design:type', Function)
661+
core_1.Input(),
662+
__metadata("design:type", Function)
663663
], SlickGrid.prototype, "isColumnEditable", void 0);
664664
__decorate([
665-
core_1.Input(),
666-
__metadata('design:type', Function)
665+
core_1.Input(),
666+
__metadata("design:type", Function)
667667
], SlickGrid.prototype, "isCellEditValid", void 0);
668668
__decorate([
669-
core_1.Output(),
670-
__metadata('design:type', core_1.EventEmitter)
669+
core_1.Output(),
670+
__metadata("design:type", core_1.EventEmitter)
671671
], SlickGrid.prototype, "loadFinished", void 0);
672672
__decorate([
673-
core_1.Output(),
674-
__metadata('design:type', core_1.EventEmitter)
673+
core_1.Output(),
674+
__metadata("design:type", core_1.EventEmitter)
675675
], SlickGrid.prototype, "editingFinished", void 0);
676676
__decorate([
677-
core_1.Output(),
678-
__metadata('design:type', core_1.EventEmitter)
677+
core_1.Output(),
678+
__metadata("design:type", core_1.EventEmitter)
679679
], SlickGrid.prototype, "contextMenu", void 0);
680680
__decorate([
681-
core_1.Output(),
682-
__metadata('design:type', core_1.EventEmitter)
681+
core_1.Output(),
682+
__metadata("design:type", core_1.EventEmitter)
683683
], SlickGrid.prototype, "topRowNumberChange", void 0);
684684
__decorate([
685-
core_1.Output(),
686-
__metadata('design:type', core_1.EventEmitter)
685+
core_1.Output(),
686+
__metadata("design:type", core_1.EventEmitter)
687687
], SlickGrid.prototype, "cellEditBegin", void 0);
688688
__decorate([
689-
core_1.Output(),
690-
__metadata('design:type', core_1.EventEmitter)
689+
core_1.Output(),
690+
__metadata("design:type", core_1.EventEmitter)
691691
], SlickGrid.prototype, "cellEditExit", void 0);
692692
__decorate([
693-
core_1.Output(),
694-
__metadata('design:type', core_1.EventEmitter)
693+
core_1.Output(),
694+
__metadata("design:type", core_1.EventEmitter)
695695
], SlickGrid.prototype, "rowEditBegin", void 0);
696696
__decorate([
697-
core_1.Output(),
698-
__metadata('design:type', core_1.EventEmitter)
697+
core_1.Output(),
698+
__metadata("design:type", core_1.EventEmitter)
699699
], SlickGrid.prototype, "rowEditExit", void 0);
700700
__decorate([
701-
core_1.HostListener('focus'),
702-
__metadata('design:type', Function),
703-
__metadata('design:paramtypes', []),
704-
__metadata('design:returntype', void 0)
701+
core_1.HostListener('focus'),
702+
__metadata("design:type", Function),
703+
__metadata("design:paramtypes", []),
704+
__metadata("design:returntype", void 0)
705705
], SlickGrid.prototype, "onFocus", null);
706706
SlickGrid = SlickGrid_1 = __decorate([
707707
core_1.Component({
@@ -711,8 +711,8 @@ SlickGrid = SlickGrid_1 = __decorate([
711711
encapsulation: core_1.ViewEncapsulation.None
712712
}),
713713
__param(0, core_1.Inject(core_1.forwardRef(() => core_1.ElementRef))),
714-
__param(1, core_1.Optional()),
715-
__param(1, core_1.Inject(core_1.forwardRef(() => gridsync_service_1.GridSyncService))),
716-
__metadata('design:paramtypes', [Object, Object])
714+
__param(1, core_1.Optional()), __param(1, core_1.Inject(core_1.forwardRef(() => gridsync_service_1.GridSyncService))),
715+
__metadata("design:paramtypes", [Object, Object])
717716
], SlickGrid);
718717
exports.SlickGrid = SlickGrid;
718+
var SlickGrid_1;

‎components/js/virtualizedcollection.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
23
/*---------------------------------------------------------------------------------------------
34
* Copyright (c) Microsoft Corporation. All rights reserved.
45
* Licensed under the MIT License. See License.txt in the project root for license information.
56
*--------------------------------------------------------------------------------------------*/
6-
const interfaces_1 = require('./interfaces');
7+
const interfaces_1 = require("./interfaces");
78
class LoadCancellationToken {
89
}
910
class DataWindow {

‎gulpfile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const exmapProj = ts.createProject('./tsconfig.json', { declaration: false });
1111

1212
gulp.task('compile:src', () => {
1313
let tsResult = gulp.src(['components/**/*.ts', 'typings/**/*.ts'])
14-
.pipe(ts(tsproj));
14+
.pipe(tsproj());
1515

1616
return merge([
1717
tsResult.dts.pipe(gulp.dest('./components/')),
@@ -23,7 +23,7 @@ gulp.task('compile:examples', (done) => {
2323
let promises = [];
2424
promises.push(new Promise((resolve) => {
2525
gulp.src(['examples/**/*.ts', 'typings/**/*.ts'])
26-
.pipe(ts(exmapProj))
26+
.pipe(exmapProj())
2727
.pipe(gulp.dest('dist'))
2828
.on('end', () => {
2929
resolve();
@@ -62,7 +62,7 @@ gulp.task('compile:examples', (done) => {
6262

6363
gulp.task('compile:index', () => {
6464
let tsResult = gulp.src(['./index.ts', 'typings/**/*.ts'])
65-
.pipe(ts(tsproj));
65+
.pipe(tsproj());
6666

6767
return merge([
6868
tsResult.dts.pipe(gulp.dest('./')),

0 commit comments

Comments
 (0)