angular-slickgrid 6.6.5 → 6.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1058,15 +1058,16 @@ class AngularSlickgridComponent {
|
|
|
1058
1058
|
}
|
|
1059
1059
|
// save resource refs to register before the grid options are merged and possibly deep copied
|
|
1060
1060
|
// since a deep copy of grid options would lose original resource refs but we want to keep them as singleton
|
|
1061
|
-
|
|
1061
|
+
const extendedGridOptions = { ...this.forRootConfig, ...this.gridOptions };
|
|
1062
|
+
this._registeredResources = extendedGridOptions?.externalResources || extendedGridOptions?.registerExternalResources || [];
|
|
1062
1063
|
/* istanbul ignore if */
|
|
1063
|
-
if (
|
|
1064
|
+
if (extendedGridOptions?.registerExternalResources) {
|
|
1064
1065
|
console.warn('[Angular-Slickgrid] Please note that the grid option `registerExternalResources` was deprecated and will be removed in next major, please use `externalResources` instead.');
|
|
1065
1066
|
}
|
|
1066
1067
|
this.initialization(this._eventHandler);
|
|
1067
1068
|
this._isGridInitialized = true;
|
|
1068
1069
|
// recheck the empty warning message after grid is shown so that it works in every use case
|
|
1069
|
-
if (this.gridOptions
|
|
1070
|
+
if (this.gridOptions?.enableEmptyDataWarningMessage && Array.isArray(this.dataset)) {
|
|
1070
1071
|
const finalTotalCount = this.dataset.length;
|
|
1071
1072
|
this.displayEmptyDataWarning(finalTotalCount < 1);
|
|
1072
1073
|
}
|