From 5384fb68048cee1782e9628fdd01dafc0b7b34e6 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Thu, 4 Mar 2021 13:30:31 +0530 Subject: [PATCH] #81 jquery modify changes --- src/editor/ConfigObj.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/editor/ConfigObj.js b/src/editor/ConfigObj.js index 53133c9d..90bd4f56 100644 --- a/src/editor/ConfigObj.js +++ b/src/editor/ConfigObj.js @@ -1,7 +1,6 @@ -/* globals $ */ - // eslint-disable-next-line node/no-unpublished-import import deparam from 'deparam'; +import {mergeDeep} from './components/jgraduate/Util.js'; /** * Escapes special characters in a regular expression. @@ -398,7 +397,8 @@ export default class ConfigObj { */ const extendOrAdd = (cfgObj, key, val) => { if (cfgObj[key] && typeof cfgObj[key] === 'object') { - $.extend(true, cfgObj[key], val); + // $.extend(true, cfgObj[key], val); + cfgObj[key] = mergeDeep(cfgObj[key], val); } else { cfgObj[key] = val; } @@ -446,7 +446,8 @@ export default class ConfigObj { extendOrAdd(this.defaultConfig, key, val); } else if (this.defaultConfig[key] && typeof this.defaultConfig[key] === 'object') { 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 { this.curConfig[key] = val; }