From 4548f90571aaad9224feb0e00fd746cc649d761f Mon Sep 17 00:00:00 2001 From: agriyadev5 Date: Tue, 17 Aug 2021 18:38:04 +0530 Subject: [PATCH] #599 revert previous changes --- src/editor/components/seSpinInput.js | 11 +------ .../dialogs/se-elix/define/NumberSpinBox.js | 15 +-------- src/editor/panels/BottomPanel.js | 10 ++---- src/editor/panels/TopPanel.js | 31 ++++--------------- src/svgcanvas/elem-get-set.js | 2 +- src/svgcanvas/selection.js | 6 ++-- 6 files changed, 13 insertions(+), 62 deletions(-) diff --git a/src/editor/components/seSpinInput.js b/src/editor/components/seSpinInput.js index eae0931f..3aa391de 100644 --- a/src/editor/components/seSpinInput.js +++ b/src/editor/components/seSpinInput.js @@ -104,9 +104,7 @@ export class SESpinInput extends HTMLElement { this.$img.remove(); break; case 'value': - if(this.$input.value !== newValue) { - this.$input.value = newValue; - } + this.$input.value = newValue; break; default: // eslint-disable-next-line no-console @@ -181,13 +179,6 @@ export class SESpinInput extends HTMLElement { * @returns {void} */ connectedCallback () { - this.$input.addEventListener('onchange', (e) => { - e.preventDefault(); - if(e.detail !== this.value && e.detail !== "" && !isNaN(e.detail) ) { - const event = new CustomEvent('change', { detail: e.detail }); - this.dispatchEvent(event); - } - }); this.$input.addEventListener('change', (e) => { e.preventDefault(); this.value = e.target.value; diff --git a/src/editor/dialogs/se-elix/define/NumberSpinBox.js b/src/editor/dialogs/se-elix/define/NumberSpinBox.js index e13caad2..2e080b12 100644 --- a/src/editor/dialogs/se-elix/define/NumberSpinBox.js +++ b/src/editor/dialogs/se-elix/define/NumberSpinBox.js @@ -1,21 +1,8 @@ import PlainNumberSpinBox from '../src/plain/PlainNumberSpinBox.js'; -import { - stateEffects -} from 'elix/src/base/internal.js'; /** * @class ElixNumberSpinBox */ -// export default class ElixNumberSpinBox extends PlainNumberSpinBox {} +export default class ElixNumberSpinBox extends PlainNumberSpinBox {} -export default class ElixNumberSpinBox extends PlainNumberSpinBox { - [stateEffects](state, changed) { - const effects = super[stateEffects]; - if(changed.value && state.value !== "" && this.value !== undefined) { - const event = new CustomEvent('onchange', { detail: state.value }); - this.dispatchEvent(event); - } - return effects; - } -} customElements.define('elix-number-spin-box', ElixNumberSpinBox); diff --git a/src/editor/panels/BottomPanel.js b/src/editor/panels/BottomPanel.js index 15947b87..4fd14c87 100644 --- a/src/editor/panels/BottomPanel.js +++ b/src/editor/panels/BottomPanel.js @@ -134,14 +134,8 @@ class BottomPanel { * @type {module} */ handleOpacity (evt) { - let val = evt.currentTarget.value; - if(evt.detail !== undefined) { - val = evt.detail; - } - val = Number.parseInt(val.split('%')[0]); - if(!isNaN(val)) { - this.editor.svgCanvas.setOpacity(val / 100); - } + const val = Number.parseInt(evt.currentTarget.value.split('%')[0]); + this.editor.svgCanvas.setOpacity(val / 100); } /** * @type {module} diff --git a/src/editor/panels/TopPanel.js b/src/editor/panels/TopPanel.js index fd59e46d..b0466cee 100644 --- a/src/editor/panels/TopPanel.js +++ b/src/editor/panels/TopPanel.js @@ -497,35 +497,23 @@ class TopPanel { * @type {module} */ changeRectRadius(e) { - let val = e.target.value; - if(e.detail !== undefined) { - val = e.detail; - } - this.editor.svgCanvas.setRectRadius(val); + this.editor.svgCanvas.setRectRadius(e.target.value); } /** * @type {module} */ changeFontSize(e) { - let val = e.target.value; - if(e.detail !== undefined) { - val = e.detail; - } - this.editor.svgCanvas.setFontSize(val); + this.editor.svgCanvas.setFontSize(e.target.value); } /** * @type {module} */ changeRotationAngle(e) { - let val = e.target.value; - if(e.detail !== undefined) { - val = e.detail; - } - this.editor.svgCanvas.setRotationAngle(val); + this.editor.svgCanvas.setRotationAngle(e.target.value); // eslint-disable-next-line max-len - (Number.parseInt(val) === 0) ? $id("tool_reorient").classList.add("disabled") : $id("tool_reorient").classList.remove("disabled"); + (Number.parseInt(e.target.value) === 0) ? $id("tool_reorient").classList.add("disabled") : $id("tool_reorient").classList.remove("disabled"); } /** @@ -533,11 +521,7 @@ class TopPanel { * @returns {void} */ changeBlur(e) { - let val = e.target.value; - if(e.detail !== undefined) { - val = e.detail; - } - this.editor.svgCanvas.setBlur(val / 10, true); + this.editor.svgCanvas.setBlur(e.target.value / 10, true); } /** * @@ -586,10 +570,7 @@ class TopPanel { */ attrChanger(e) { const attr = e.target.getAttribute("data-attr"); - let val = e?.target?.value; - if(e.detail !== undefined) { - val = e.detail; - } + let val = e.target.value; const valid = isValidUnit(attr, val, this.selectedElement); if (!valid) { diff --git a/src/svgcanvas/elem-get-set.js b/src/svgcanvas/elem-get-set.js index 41dd0a21..32c63c30 100644 --- a/src/svgcanvas/elem-get-set.js +++ b/src/svgcanvas/elem-get-set.js @@ -828,7 +828,7 @@ export const setRectRadiusMethod = function (val) { const selected = selectedElements[0]; if (!isNullish(selected) && selected.tagName === 'rect') { const r = selected.getAttribute('rx'); - if (r !== String(val) && !isNullish(val)) { + if (r !== String(val)) { selected.setAttribute('rx', val); selected.setAttribute('ry', val); elemContext_.addCommandToHistory(new ChangeElementCommand(selected, { rx: r, ry: r }, 'Radius')); diff --git a/src/svgcanvas/selection.js b/src/svgcanvas/selection.js index 05318c46..7435f48d 100644 --- a/src/svgcanvas/selection.js +++ b/src/svgcanvas/selection.js @@ -385,10 +385,8 @@ export const setRotationAngle = function (val, preventUndo) { } else { elem.removeAttribute('transform'); } - if (oldTransform !== newTransform) { - svgCanvas.changeSelectedAttribute('transform', newTransform, selectedElements()); - svgCanvas.call('changed', selectedElements()); - } + svgCanvas.changeSelectedAttribute('transform', newTransform, selectedElements()); + svgCanvas.call('changed', selectedElements()); } // const pointGripContainer = getElem('pathpointgrip_container'); // if (elem.nodeName === 'path' && pointGripContainer) {