From 7a3c2a0b58c6fa39402ad8b0ba7b0a4d365603c6 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Sat, 22 May 2021 18:37:38 +0530 Subject: [PATCH] #103 textContent get issue --- src/editor/panels/LayersPanel.js | 6 ++++-- src/svgcanvas/elem-get-set.js | 2 +- src/svgcanvas/history.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/editor/panels/LayersPanel.js b/src/editor/panels/LayersPanel.js index 34eac5be..6e162ff7 100644 --- a/src/editor/panels/LayersPanel.js +++ b/src/editor/panels/LayersPanel.js @@ -325,7 +325,8 @@ class LayersPanel { * @returns {void} */ layerRename() { - const oldName = document.querySelector("#layerlist tr.layersel td.layername").textContent; + const ele = document.querySelector("#layerlist tr.layersel td.layername"); + const oldName = (ele) ? ele.textContent : ''; const newName = prompt(this.editor.i18next.t('notification.enterNewLayerName'), ""); if (!newName) { return; @@ -425,7 +426,8 @@ class LayersPanel { const elements = $id('layerlist').querySelectorAll("td.layervis"); Array.from(elements).forEach(function(element) { element.addEventListener('click', function(evt) { - const name = evt.currentTarget.parentNode.querySelector("td.layername").textContent; + const ele = evt.currentTarget.parentNode.querySelector("td.layername"); + const name = (ele)? ele.textContent : ''; const vis = evt.currentTarget.classList.contains("layerinvis"); self.editor.svgCanvas.setLayerVisibility(name, vis); evt.currentTarget.classList.toggle("layerinvis"); diff --git a/src/svgcanvas/elem-get-set.js b/src/svgcanvas/elem-get-set.js index f2696069..f25ed2ce 100644 --- a/src/svgcanvas/elem-get-set.js +++ b/src/svgcanvas/elem-get-set.js @@ -722,7 +722,7 @@ export const getTextMethod = function () { const selectedElements = elemContext_.getSelectedElements(); const selected = selectedElements[0]; if (isNullish(selected)) { return ''; } - return selected.textContent; + return (selected) ? selected.textContent : ''; }; /** diff --git a/src/svgcanvas/history.js b/src/svgcanvas/history.js index e8ab6a3a..73d03c01 100644 --- a/src/svgcanvas/history.js +++ b/src/svgcanvas/history.js @@ -294,7 +294,7 @@ export class ChangeElementCommand extends Command { this.oldValues = attrs; for (const attr in attrs) { if (attr === '#text') { - this.newValues[attr] = elem.textContent; + this.newValues[attr] = (elem) ? elem.textContent : ''; } else if (attr === '#href') { this.newValues[attr] = getHref(elem); } else {