From e8097599c7728bf733c3f47e80c7d0140cfe3363 Mon Sep 17 00:00:00 2001 From: agriyadev5 Date: Thu, 10 Jun 2021 19:06:43 +0530 Subject: [PATCH 1/4] #584 the select button changes when working on a path --- src/editor/Editor.js | 9 ++------- src/editor/panels/TopPanel.js | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 39234007..5c296d13 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -346,13 +346,8 @@ class Editor extends EditorStartup { $id('path_node_panel').style.display = (editmode) ? 'block' : 'none'; if (editmode) { // Change select icon - const elements = document.getElementsByClassName("tool_button_current"); - Array.from(elements).forEach(function (element) { - element.classList.add('tool_button_current'); - element.classList.remove('tool_button'); - }); - $id('tool_select').classList.add('tool_button_current'); - $id('tool_select').classList.remove('tool_button'); + $id('tool_path').pressed = false; + $id('tool_select').pressed = true; this.multiselected = false; if (elems.length) { this.selectedElement = elems[0]; diff --git a/src/editor/panels/TopPanel.js b/src/editor/panels/TopPanel.js index c8a03715..8a220856 100644 --- a/src/editor/panels/TopPanel.js +++ b/src/editor/panels/TopPanel.js @@ -634,8 +634,8 @@ class TopPanel { * @returns {void} */ linkControlPoints() { - const linked = $id("tool_node_link").pressed; - $id("tool_node_link").pressed = !linked; + $id("tool_node_link").pressed = ($id("tool_node_link").pressed) ? false : true; + const linked = ($id("tool_node_link").pressed) ? true : false; this.path.linkControlPoints(linked); } @@ -968,7 +968,7 @@ class TopPanel {
- +
From 86f70db5710479d7416d584296cb6de4e88aaec5 Mon Sep 17 00:00:00 2001 From: agriyadev5 Date: Fri, 11 Jun 2021 11:31:47 +0530 Subject: [PATCH 2/4] #584 icon change issue fixed --- src/editor/Editor.js | 3 ++- src/editor/panels/TopPanel.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor/Editor.js b/src/editor/Editor.js index 5c296d13..1e25086f 100644 --- a/src/editor/Editor.js +++ b/src/editor/Editor.js @@ -348,13 +348,14 @@ class Editor extends EditorStartup { // Change select icon $id('tool_path').pressed = false; $id('tool_select').pressed = true; + $id('tool_select').setAttribute('src', './images/select_node.svg'); this.multiselected = false; if (elems.length) { this.selectedElement = elems[0]; } } else { setTimeout(() => { - // setIcon('#tool_select', 'select'); + $id('tool_select').setAttribute('src', './images/select.svg'); }, 1000); } } diff --git a/src/editor/panels/TopPanel.js b/src/editor/panels/TopPanel.js index 8a220856..51507bf2 100644 --- a/src/editor/panels/TopPanel.js +++ b/src/editor/panels/TopPanel.js @@ -968,7 +968,7 @@ class TopPanel {
- +
From 9ba9d7ef7b3c94bc21a5763e56f187d3ea314dbc Mon Sep 17 00:00:00 2001 From: agriyadev5 Date: Fri, 11 Jun 2021 12:15:26 +0530 Subject: [PATCH 3/4] #584 pressed modified and committed --- src/editor/panels/TopPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/panels/TopPanel.js b/src/editor/panels/TopPanel.js index 51507bf2..32aa5523 100644 --- a/src/editor/panels/TopPanel.js +++ b/src/editor/panels/TopPanel.js @@ -968,7 +968,7 @@ class TopPanel {
- +
From 537b98f7cbe6ff968ae1b07bb6fcb67ad2fc1273 Mon Sep 17 00:00:00 2001 From: agriyadev5 Date: Fri, 11 Jun 2021 13:23:57 +0530 Subject: [PATCH 4/4] #584 attributeChangedCallback changed callback changes --- src/editor/components/seButton.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editor/components/seButton.js b/src/editor/components/seButton.js index 7715d4fe..52e18f7b 100644 --- a/src/editor/components/seButton.js +++ b/src/editor/components/seButton.js @@ -87,10 +87,10 @@ export class ToolButton extends HTMLElement { this.$img.setAttribute('src', newValue); break; case 'pressed': - if (newValue) { - this.$div.classList.add('pressed'); - } else { + if (newValue === null) { this.$div.classList.remove('pressed'); + } else { + this.$div.classList.add('pressed'); } break; case 'size': @@ -145,7 +145,7 @@ export class ToolButton extends HTMLElement { if (value) { this.setAttribute('pressed', 'true'); } else { - this.removeAttribute('pressed', ''); + this.removeAttribute('pressed'); } } /** @@ -165,7 +165,7 @@ export class ToolButton extends HTMLElement { if (value) { this.setAttribute('disabled', 'true'); } else { - this.removeAttribute('disabled', ''); + this.removeAttribute('disabled'); } } /**