From 12ad6e4d5586fbd5c03e0310fc72bd8d00011b9b Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Mon, 4 Jan 2021 12:09:45 +0530 Subject: [PATCH 1/4] #issue-fix The new menu will ask if you want to erase the current content but it will ignore the answer --- src/editor/svgedit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/editor/svgedit.js b/src/editor/svgedit.js index 742ba63e..f9bd9033 100644 --- a/src/editor/svgedit.js +++ b/src/editor/svgedit.js @@ -1071,10 +1071,10 @@ class Editor extends EditorStartup { * @fires module:svgcanvas.SvgCanvas#event:ext_onNewDocument * @returns {void} */ - clickClear () { + async clickClear () { const [x, y] = this.configObj.curConfig.dimensions; - const ok = seConfirm(this.uiStrings.notification.QwantToClear); - if (!ok) { + const ok = await seConfirm(this.uiStrings.notification.QwantToClear); + if (ok === 'Cancel') { return; } this.leftPanelHandlers.clickSelect(); From dc92748b64954426cde30c3c66c2492636b71711 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Mon, 4 Jan 2021 14:02:25 +0530 Subject: [PATCH 2/4] #issue-fix dialog needs to be closer than the original --- src/editor/svgedit.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/editor/svgedit.css b/src/editor/svgedit.css index 4661c3c6..15c97994 100644 --- a/src/editor/svgedit.css +++ b/src/editor/svgedit.css @@ -1014,3 +1014,10 @@ ul li.current { background: #B0B0B0; border: 1px solid #000; } +elix-alert-dialog::part(frame) { + background: #CCC; + width: 300px; + border: 1px outset #777; + font-size: 0.8em; + font-family: Verdana,Helvetica,sans-serif; +} From 62d63b3efdd484fa7abf28dd5098fffbe403f250 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Mon, 4 Jan 2021 16:24:33 +0530 Subject: [PATCH 3/4] #issue-fix main menu alignment changes --- src/editor/components/seMenu.js | 4 ++++ src/editor/components/seMenuItem.js | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/editor/components/seMenu.js b/src/editor/components/seMenu.js index 27436fa9..e1277963 100644 --- a/src/editor/components/seMenu.js +++ b/src/editor/components/seMenu.js @@ -17,6 +17,10 @@ template.innerHTML = ` :host ::slotted([current]){ background-color: #F4E284 !important; } + :host ::slotted(*){ + padding: 0.25em 1.25em 0.25em 0.25em !important; + margin: 2px; + } diff --git a/src/editor/components/seMenuItem.js b/src/editor/components/seMenuItem.js index 288ea17e..d270d411 100644 --- a/src/editor/components/seMenuItem.js +++ b/src/editor/components/seMenuItem.js @@ -7,9 +7,9 @@ template.innerHTML = ` -
+
icon - +
`; @@ -29,7 +29,7 @@ export class SeMenuItem extends HTMLElement { this.$label = this._shadowRoot.querySelector('span'); this.$menuitem = this._shadowRoot.querySelector('elix-menu-item'); this.$svg = this.$menuitem.shadowRoot.querySelector('#checkmark'); - this.$svg.setAttribute('style', 'width:1px;height:1px;'); + this.$svg.setAttribute('style', 'display: none;'); } /** * @function observedAttributes From b173b6c2f73ba403588b870a1a9b7ee7f2badaf8 Mon Sep 17 00:00:00 2001 From: Agriya Dev5 Date: Mon, 4 Jan 2021 19:56:12 +0530 Subject: [PATCH 4/4] #issue_fix double click and opensvg issue fixed --- src/editor/components/seMenu.js | 4 ++-- src/editor/dialogs/seConfirmDialog.js | 2 +- src/editor/extensions/ext-opensave/ext-opensave.js | 2 +- src/editor/svgedit.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/editor/components/seMenu.js b/src/editor/components/seMenu.js index e1277963..03ce7b58 100644 --- a/src/editor/components/seMenu.js +++ b/src/editor/components/seMenu.js @@ -111,7 +111,7 @@ export class SeMenu extends HTMLElement { * @function connectedCallback * @returns {void} */ - connectedCallback () { + /* connectedCallback () { this.$menu.addEventListener('openedchange', (e) => { e.preventDefault(); const selectedItem = e?.detail?.closeResult; @@ -119,7 +119,7 @@ export class SeMenu extends HTMLElement { document.getElementById(selectedItem.id).click(); } }); - } + } */ } // Register diff --git a/src/editor/dialogs/seConfirmDialog.js b/src/editor/dialogs/seConfirmDialog.js index b2502ff1..66aa5cd0 100644 --- a/src/editor/dialogs/seConfirmDialog.js +++ b/src/editor/dialogs/seConfirmDialog.js @@ -1,8 +1,8 @@ // eslint-disable-next-line node/no-unpublished-import import AlertDialog from 'elix/define/AlertDialog.js'; -const dialog = new AlertDialog(); const seConfirm = async (text, choices) => { + const dialog = new AlertDialog(); dialog.textContent = text; dialog.choices = (choices === undefined) ? ['Ok', 'Cancel'] : choices; dialog.open(); diff --git a/src/editor/extensions/ext-opensave/ext-opensave.js b/src/editor/extensions/ext-opensave/ext-opensave.js index ad736155..d6bb550e 100644 --- a/src/editor/extensions/ext-opensave/ext-opensave.js +++ b/src/editor/extensions/ext-opensave/ext-opensave.js @@ -54,7 +54,7 @@ export default { }, async open () { const ok = await this.openPrep(); - if (!ok) { return; } + if (ok === 'Cancel') { return; } this.svgCanvas.clear(); const input = document.createElement('input'); input.type = 'file'; diff --git a/src/editor/svgedit.js b/src/editor/svgedit.js index f9bd9033..f63ef3bc 100644 --- a/src/editor/svgedit.js +++ b/src/editor/svgedit.js @@ -1398,12 +1398,12 @@ class Editor extends EditorStartup { * @returns {boolean|Promise} Resolves to boolean indicating `true` if there were no changes * and `false` after the user confirms. */ - openPrep () { + async openPrep () { $('#main_menu').hide(); if (this.svgCanvas.undoMgr.getUndoStackSize() === 0) { return true; } - return seConfirm(this.uiStrings.notification.QwantToOpen); + return await seConfirm(this.uiStrings.notification.QwantToOpen); } /**