@worktile/theia 3.0.0-next.1 → 3.0.0-next.2
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.
- package/bundles/worktile-theia.umd.js +5 -6
- package/bundles/worktile-theia.umd.js.map +1 -1
- package/core/utils/merge-options.d.ts +2 -2
- package/esm2015/core/utils/merge-options.js +5 -5
- package/esm2015/core/utils/override-plugins-by-key.js +2 -2
- package/fesm2015/worktile-theia.js +5 -5
- package/fesm2015/worktile-theia.js.map +1 -1
- package/package.json +1 -1
|
@@ -1454,16 +1454,15 @@
|
|
|
1454
1454
|
|
|
1455
1455
|
var getPluginOptions = function (editor, key) { var _a; return (_a = getPlugin(editor, key).options) !== null && _a !== void 0 ? _a : {}; };
|
|
1456
1456
|
|
|
1457
|
-
var mergeOptions = function (plugin,
|
|
1458
|
-
|
|
1459
|
-
var options = overrideByKey[plugin.key].options;
|
|
1457
|
+
var mergeOptions = function (plugin, override) {
|
|
1458
|
+
var options = plugin.options;
|
|
1460
1459
|
var newOptions = {};
|
|
1461
1460
|
for (var option in options) {
|
|
1462
1461
|
if (Array.isArray(options[option])) {
|
|
1463
|
-
newOptions[option] = _.union(options[option],
|
|
1462
|
+
newOptions[option] = _.union(options[option], override.options[option]);
|
|
1464
1463
|
continue;
|
|
1465
1464
|
}
|
|
1466
|
-
newOptions[option] =
|
|
1465
|
+
newOptions[option] = options[option];
|
|
1467
1466
|
}
|
|
1468
1467
|
plugin.options = newOptions;
|
|
1469
1468
|
return plugin;
|
|
@@ -1475,7 +1474,7 @@
|
|
|
1475
1474
|
var overridePluginsByKey = function (plugin, overrideByKey, nested) {
|
|
1476
1475
|
if (overrideByKey === void 0) { overrideByKey = {}; }
|
|
1477
1476
|
if (overrideByKey[plugin.key]) {
|
|
1478
|
-
plugin = mergeOptions(plugin, overrideByKey);
|
|
1477
|
+
plugin = mergeOptions(plugin, overrideByKey[plugin.key]);
|
|
1479
1478
|
var _a = overrideByKey[plugin.key], pluginOverridesPlugins = _a.plugins, pluginOverrides = __rest(_a, ["plugins"]);
|
|
1480
1479
|
plugin = _.defaultsDeep(pluginOverrides, plugin);
|
|
1481
1480
|
if (!nested) {
|