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

#104 jquery extend convert changes

master
Agriya Dev5 2021-05-24 12:12:26 +05:30
parent 3bf54e5a95
commit 78b5ea1010
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/svgcanvas/svgcanvas.js
View File

@ -322,9 +322,8 @@ class SvgCanvas {
opacity: curConfig.initOpacity opacity: curConfig.initOpacity
} }
}; };
allProperties.text = this.mergeDeep({}, allProperties.shape);
allProperties.text = $.extend(true, {}, allProperties.shape); allProperties.text = this.mergeDeep(allProperties.text, {
$.extend(allProperties.text, {
fill: '#000000', fill: '#000000',
stroke_width: curConfig.text && curConfig.text.stroke_width, stroke_width: curConfig.text && curConfig.text.stroke_width,
font_size: curConfig.text && curConfig.text.font_size, font_size: curConfig.text && curConfig.text.font_size,
@ -892,7 +891,7 @@ class SvgCanvas {
* @type {module:svgcanvas.ExtensionArgumentObject} * @type {module:svgcanvas.ExtensionArgumentObject}
* @see {@link module:svgcanvas.PrivateMethods} source for the other methods/properties * @see {@link module:svgcanvas.PrivateMethods} source for the other methods/properties
*/ */
const argObj = $.extend(canvas.getPrivateMethods(), { const argObj = canvas.mergeDeep(canvas.getPrivateMethods(), {
$: jq, $: jq,
importLocale, importLocale,
svgroot, svgroot,
@ -904,7 +903,6 @@ class SvgCanvas {
if (extObj) { if (extObj) {
extObj.name = name; extObj.name = name;
} }
extensions[name] = extObj; extensions[name] = extObj;
return call('extension_added', extObj); return call('extension_added', extObj);
}; };