github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#81 jquery modify changes

Browse Source
This commit is contained in:
Agriya Dev5
2021-03-04 13:30:31 +05:30
parent 85f2e363df
commit 5384fb6804
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/editor/ConfigObj.js
View File

@@ -1,7 +1,6 @@
/* globals $ */
// eslint-disable-next-line node/no-unpublished-import // eslint-disable-next-line node/no-unpublished-import
import deparam from 'deparam'; import deparam from 'deparam';
import {mergeDeep} from './components/jgraduate/Util.js';
/** /**
* Escapes special characters in a regular expression. * Escapes special characters in a regular expression.
@@ -398,7 +397,8 @@ export default class ConfigObj {
*/ */
const extendOrAdd = (cfgObj, key, val) => { const extendOrAdd = (cfgObj, key, val) => {
if (cfgObj[key] && typeof cfgObj[key] === 'object') { if (cfgObj[key] && typeof cfgObj[key] === 'object') {
$.extend(true, cfgObj[key], val); // $.extend(true, cfgObj[key], val);
cfgObj[key] = mergeDeep(cfgObj[key], val);
} else { } else {
cfgObj[key] = val; cfgObj[key] = val;
} }
@@ -446,7 +446,8 @@ export default class ConfigObj {
extendOrAdd(this.defaultConfig, key, val); extendOrAdd(this.defaultConfig, key, val);
} else if (this.defaultConfig[key] && typeof this.defaultConfig[key] === 'object') { } else if (this.defaultConfig[key] && typeof this.defaultConfig[key] === 'object') {
this.curConfig[key] = Array.isArray(this.defaultConfig[key]) ? [] : {}; this.curConfig[key] = Array.isArray(this.defaultConfig[key]) ? [] : {};
$.extend(true, this.curConfig[key], val); // Merge properties recursively, e.g., on initFill, initStroke objects this.curConfig[key] = mergeDeep(this.curConfig[key], val);
// $.extend(true, this.curConfig[key], val); // Merge properties recursively, e.g., on initFill, initStroke objects
} else { } else {
this.curConfig[key] = val; this.curConfig[key] = val;
} }