Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
36 changes: 17 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
"."
],
"dest": "dist",
"workingDirectory": ".ng_build",
"lib": {
"entryFile": "src/public_api.ts",
"umdModuleIds": {
Expand Down Expand Up @@ -117,19 +116,18 @@
},
"devDependencies": {
"@angular-builders/jest": "^7.4.2",
"@angular-devkit/build-angular": "~0.13.1",
"@angular/animations": "^7.2.15",
"@angular/cli": "^7.3.1",
"@angular/common": "^7.2.15",
"@angular/compiler": "7.2.15",
"@angular/compiler-cli": "7.2.15",
"@angular/core": "^7.2.15",
"@angular/forms": "^7.2.15",
"@angular/http": "^7.2.15",
"@angular/language-service": "^7.2.15",
"@angular/platform-browser": "^7.2.15",
"@angular/platform-browser-dynamic": "^7.2.15",
"@angular/router": "^7.2.15",
"@angular-devkit/build-angular": "~0.803.29",
"@angular/animations": "^8.2.14",
"@angular/cli": "^8.3.29",
"@angular/common": "^8.2.14",
"@angular/compiler": "8.2.14",
"@angular/compiler-cli": "8.2.14",
"@angular/core": "^8.2.14",
"@angular/forms": "^8.2.14",
"@angular/language-service": "^8.2.14",
"@angular/platform-browser": "^8.2.14",
"@angular/platform-browser-dynamic": "^8.2.14",
"@angular/router": "^8.2.14",
"@ng-select/ng-select": "^2.15.3",
"@ngx-translate/core": "^11.0.1",
"@ngx-translate/http-loader": "^4.0.0",
Expand All @@ -143,7 +141,7 @@
"babel-jest": "^24.9.0",
"bootstrap": "3.4.1",
"codecov": "^3.7.0",
"codelyzer": "~4.5.0",
"codelyzer": "^5.0.1",
"conventional-changelog": "^3.1.23",
"copyfiles": "^2.3.0",
"core-js": "^2.6.11",
Expand All @@ -159,7 +157,7 @@
"jest-extended": "^0.11.5",
"jest-junit": "^6.4.0",
"jest-preset-angular": "^6.0.1",
"ng-packagr": "~5.3.0",
"ng-packagr": "^5.4.0",
"ngx-bootstrap": "^4.3.0",
"node-sass": "4.14.1",
"npm-run-all": "^4.1.5",
Expand All @@ -169,13 +167,13 @@
"run-sequence": "^2.2.1",
"standard-version": "^9.0.0",
"ts-node": "~3.3.0",
"tsickle": "^0.34.0",
"tsickle": "^0.37.0",
"tslib": "^2.0.1",
"tslint": "^5.12.0",
"typescript": ">=3.1.1 <3.2.0",
"typescript": "3.5.3",
"uglify-js": "^3.10.2",
"vinyl-paths": "^2.1.0",
"yargs": "^15.4.1",
"zone.js": "^0.8.29"
"zone.js": "~0.9.1"
}
}
4 changes: 2 additions & 2 deletions src/app/examples/swt-common-grid-test.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export class SwtCommonGridTestComponent implements OnInit, AfterViewInit {
testurl = 'http://127.0.0.1:8080/grid!display.do?';
currentUrl = this.testurl;

@ViewChild('commonGrid1') commonGrid: SwtCommonGridComponent;
@ViewChild('commonGridPag1') commonGridPag: SwtCommonGridPaginationComponent;
@ViewChild('commonGrid1', { static: true }) commonGrid: SwtCommonGridComponent;
@ViewChild('commonGridPag1', { static: true }) commonGridPag: SwtCommonGridPaginationComponent;

private logger: Logger = null;

Expand Down
2 changes: 1 addition & 1 deletion src/app/examples/swt-common-grid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class SwtCommonGridComponent implements OnInit, AfterViewInit, BackendSer
gridHeightString: string;
gridWidthString: string;

@ViewChild('angularSlickGrid') angularSlickGrid: AngularSlickgridComponent;
@ViewChild('angularSlickGrid', { static: true }) angularSlickGrid: AngularSlickgridComponent;

columnDefinitions: Column[] = [];
dataset: any[];
Expand Down
21 changes: 3 additions & 18 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,13 @@
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
*
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
* Learn more in https://angular.io/guide/browser-support
*/

/***************************************************************************************************
* BROWSER POLYFILLS
*/
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
import 'core-js/es6/symbol';
import 'core-js/es6/object';
import 'core-js/es6/function';
import 'core-js/es6/parse-int';
import 'core-js/es6/parse-float';
import 'core-js/es6/number';
import 'core-js/es6/math';
import 'core-js/es6/string';
import 'core-js/es6/date';
import 'core-js/es6/array';
import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/weak-map';
import 'core-js/es6/set';

/** IE11 was throwing console errors without these (cannot find "includes") */
import 'core-js/es7/array';
Expand Down
1 change: 0 additions & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"allowSyntheticDefaultImports": true,
"outDir": "../out-tsc/app",
"baseUrl": "./",
"module": "es2015",
"types": [
"moment",
"jquery"
Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"compileOnSave": false,
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
Expand All @@ -13,7 +14,7 @@
"noImplicitReturns": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"target": "es2015",
"typeRoots": [
"node_modules/@types",
"typings"
Expand All @@ -22,7 +23,7 @@
"es2017",
"dom"
],
"module": "es2015",
"module": "esnext",
"baseUrl": "./",
"paths": {
"jszip": [
Expand Down
8 changes: 4 additions & 4 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@
"app",
"kebab-case"
],
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
"no-inputs-metadata-property": true,
"no-outputs-metadata-property": true,
"no-host-metadata-property": true,
"no-input-rename": true,
"no-output-rename": false,
"use-life-cycle-interface": true,
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"component-class-suffix": true,
"directive-class-suffix": true,
Expand Down