Skip to content

Commit

Permalink
Merge branch 'master' into feat/internal-controls-and-plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
ghiscoding committed Aug 30, 2021
2 parents bebd4a7 + 3ff43d9 commit b64dacb
Show file tree
Hide file tree
Showing 9 changed files with 570 additions and 442 deletions.
8 changes: 4 additions & 4 deletions examples/webpack-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"devDependencies": {
"@types/jquery": "^3.5.6",
"@types/moment": "^2.13.0",
"@types/node": "^16.6.1",
"@types/node": "^16.7.6",
"@types/webpack": "^5.28.0",
"clean-webpack-plugin": "4.0.0-alpha.0",
"copy-webpack-plugin": "^9.0.1",
Expand All @@ -46,13 +46,13 @@
"html-webpack-plugin": "5.3.2",
"mini-css-extract-plugin": "^2.2.0",
"rxjs": "^7.3.0",
"sass": "^1.38.0",
"sass": "^1.38.2",
"sass-loader": "^12.1.0",
"style-loader": "^3.2.1",
"ts-loader": "^9.2.5",
"ts-node": "^10.2.0",
"ts-node": "^10.2.1",
"url-loader": "^4.1.1",
"webpack": "^5.50.0",
"webpack": "^5.51.1",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^3.11.2"
}
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,27 @@
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/node": "^16.6.1",
"@typescript-eslint/eslint-plugin": "^4.29.2",
"@typescript-eslint/parser": "^4.29.2",
"cypress": "^8.3.0",
"@types/node": "^16.7.6",
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3",
"cypress": "^8.3.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.24.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-prefer-arrow": "^1.2.3",
"jest": "^27.0.6",
"jest-cli": "^27.0.6",
"jest-environment-jsdom": "^27.0.6",
"jest": "^27.1.0",
"jest-cli": "^27.1.0",
"jest-environment-jsdom": "^27.1.0",
"jest-extended": "^0.11.5",
"jsdom": "^17.0.0",
"jsdom-global": "^3.0.2",
"lerna": "^3.22.1",
"mocha": "^9.0.3",
"mocha": "^9.1.1",
"mochawesome": "^6.2.2",
"npm-run-all": "^4.1.5",
"rxjs": "^7.3.0",
"serve": "^12.0.0",
"ts-jest": "^27.0.5",
"typescript": "^4.3.5"
"typescript": "^4.4.2"
},
"engines": {
"node": ">=14.15.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@types/dompurify": "^2.2.3",
"@types/jquery": "^3.5.6",
"@types/moment": "^2.13.0",
"autoprefixer": "^10.3.1",
"autoprefixer": "^10.3.3",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"mini-css-extract-plugin": "^2.2.0",
Expand All @@ -86,7 +86,7 @@
"postcss": "^8.3.6",
"postcss-cli": "^8.3.1",
"rimraf": "^3.0.2",
"sass": "^1.38.0"
"sass": "^1.38.2"
},
"engines": {
"node": ">=14.15.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/common/src/filters/dateRangeFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ export class DateRangeFilter implements Filter {
this._clearFilterTriggered = true;
this._shouldTriggerQuery = shouldTriggerQuery;
this.searchTerms = [];
this.flatInstance.clear();
if (this.flatInstance.input) {
this.flatInstance.clear();
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ export class SlickCompositeEditorComponent implements ExternalResource {
}
return this;

} catch (error) {
} catch (error: any) {
this.dispose();
const errorMsg = (typeof error === 'string') ? error : (error?.message ?? error?.body?.message ?? '');
const errorCode = (typeof error === 'string') ? error : error?.status ?? error?.body?.status ?? errorMsg;
Expand Down Expand Up @@ -738,7 +738,7 @@ export class SlickCompositeEditorComponent implements ExternalResource {
// close the modal only when successful
this.dispose();
}
} catch (error) {
} catch (error: any) {
const errorMsg = (typeof error === 'string') ? error : (error?.message ?? error?.body?.message ?? '');
this.showValidationSummaryText(true, errorMsg);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/excel-export/src/excelExport.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ export class ExcelExportService implements ExternalResource, BaseExcelExportServ
*/
startDownloadFile(options: { filename: string, blob: Blob, data: any[] }) {
// when using IE/Edge, then use different download call
if (typeof navigator.msSaveOrOpenBlob === 'function') {
navigator.msSaveOrOpenBlob(options.blob, options.filename);
if (typeof (navigator as any).msSaveOrOpenBlob === 'function') {
(navigator as any).msSaveOrOpenBlob(options.blob, options.filename);
} else {
// this trick will generate a temp <a /> tag
// the code will then trigger a hidden click for it to start downloading
Expand Down
4 changes: 2 additions & 2 deletions packages/text-export/src/textExport.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ export class TextExportService implements ExternalResource, BaseTextExportServic
});

// when using IE/Edge, then use different download call
if (typeof navigator.msSaveOrOpenBlob === 'function') {
navigator.msSaveOrOpenBlob(blob, options.filename);
if (typeof (navigator as any).msSaveOrOpenBlob === 'function') {
(navigator as any).msSaveOrOpenBlob(blob, options.filename);
} else {
// this trick will generate a temp <a /> tag
// the code will then trigger a hidden click for it to start downloading
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"ts-loader": "^9.2.5",
"webpack": "^5.50.0"
"webpack": "^5.51.1"
}
}
Loading

0 comments on commit b64dacb

Please sign in to comment.