ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update ngrid, redefine prototypes of datatypes

Browse Source 
Updates ngrid to the latest version
Use Object.defineProperty instead of
Number.prototype to safer extend native datatypes
This commit is contained in:
Sean Engelhardt 2020-01-23 12:38:46 +01:00
parent 7a23139f5e
commit c2ad39a2c5
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/package.json
View File

@ -48,9 +48,9 @@
"@ngx-pwa/local-storage": "~8.2.1", "@ngx-pwa/local-storage": "~8.2.1",
"@ngx-translate/core": "~11.0.1", "@ngx-translate/core": "~11.0.1",
"@ngx-translate/http-loader": "^4.0.0", "@ngx-translate/http-loader": "^4.0.0",
"@pebula/ngrid": "1.0.0-rc.9", "@pebula/ngrid": "1.0.0-rc.16",
"@pebula/ngrid-material": "1.0.0-rc.9", "@pebula/ngrid-material": "1.0.0-rc.16",
"@pebula/utils": "1.0.0", "@pebula/utils": "1.0.2",
"@tinymce/tinymce-angular": "^3.2.0", "@tinymce/tinymce-angular": "^3.2.0",
"acorn": "^7.0.0", "acorn": "^7.0.0",
"core-js": "^3.2.1", "core-js": "^3.2.1",

51
client/src/app/app.component.ts
View File

@ -112,27 +112,29 @@ export class AppComponent {
* Will add a whitespace after a comma and shorten the output to * Will add a whitespace after a comma and shorten the output to
* three strings. * three strings.
* *
* TODO: There might be a better place for overloading functions than app.component * TODO: Should be renamed
* TODO: Overloading can be extended to more functions.
*/ */
private overloadArrayToString(): void { private overloadArrayToString(): void {
Array.prototype.toString = function(): string { Object.defineProperty(Array.prototype, 'toString', {
let string = ''; value: function(): string {
const iterations = Math.min(this.length, 3); let string = '';
const iterations = Math.min(this.length, 3);
for (let i = 0; i <= iterations; i++) { for (let i = 0; i <= iterations; i++) {
if (i < iterations) { if (i < iterations) {
string += this[i]; string += this[i];
} }
if (i < iterations - 1) { if (i < iterations - 1) {
string += ', '; string += ', ';
} else if (i === iterations && this.length > iterations) { } else if (i === iterations && this.length > iterations) {
string += ', ...'; string += ', ...';
}
} }
} return string;
return string; },
}; enumerable: false
});
} }
/** /**
@ -142,9 +144,11 @@ export class AppComponent {
private overloadFlatMap(): void { private overloadFlatMap(): void {
const concat = (x: any, y: any) => x.concat(y); const concat = (x: any, y: any) => x.concat(y);
const flatMap = (f: any, xs: any) => xs.map(f).reduce(concat, []); const flatMap = (f: any, xs: any) => xs.map(f).reduce(concat, []);
Array.prototype.flatMap = function(f: any): any[] {
return flatMap(f, this); Object.defineProperty(Array.prototype, 'flatMap', {
}; value: flatMap,
enumerable: false
});
} }
/** /**
@ -152,8 +156,11 @@ export class AppComponent {
* TODO: Remove this, if the remainder operation is changed to modulo. * TODO: Remove this, if the remainder operation is changed to modulo.
*/ */
private overloadModulo(): void { private overloadModulo(): void {
Number.prototype.modulo = function(n: number): number { Object.defineProperty(Number.prototype, 'modulo', {
return ((this % n) + n) % n; value: function(n: number): number {
}; return ((this % n) + n) % n;
},
enumerable: false
});
} }
} }

2
client/src/app/shared/components/list-view-table/list-view-table.component.ts
View File

@ -13,7 +13,7 @@ import {
import { NavigationStart, Router } from '@angular/router'; import { NavigationStart, Router } from '@angular/router';
import { columnFactory, createDS, DataSourcePredicate, PblDataSource, PblNgridComponent } from '@pebula/ngrid'; import { columnFactory, createDS, DataSourcePredicate, PblDataSource, PblNgridComponent } from '@pebula/ngrid';
import { PblColumnDefinition, PblColumnFactory, PblNgridColumnSet } from '@pebula/ngrid/lib/table'; import { PblColumnDefinition, PblColumnFactory, PblNgridColumnSet } from '@pebula/ngrid/lib/grid';
import { PblNgridDataMatrixRow } from '@pebula/ngrid/target-events'; import { PblNgridDataMatrixRow } from '@pebula/ngrid/target-events';
import { Observable, Subscription } from 'rxjs'; import { Observable, Subscription } from 'rxjs';
import { distinctUntilChanged, filter } from 'rxjs/operators'; import { distinctUntilChanged, filter } from 'rxjs/operators';