Overview
Comment: | [fx] move button when text area is resized, gc panel: prevent recheckParagraph when closed |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | fx |
Files: | files | file ages | folders |
SHA3-256: |
90fe38d829aca1919e083b76af870e69 |
User & Date: | olr on 2020-04-07 22:23:43 |
Original Comment: | [fx] move button when text area is resized |
Other Links: | manifest | tags |
Context
2020-04-08
| ||
07:31 | [fr] ajustements check-in: 651318a215 user: olr tags: trunk, fr | |
2020-04-07
| ||
22:23 | [fx] move button when text area is resized, gc panel: prevent recheckParagraph when closed check-in: 90fe38d829 user: olr tags: trunk, fx | |
22:21 | [fr] faux positif et ajustements check-in: 26c9bbaed1 user: olr tags: trunk, fr | |
Changes
Modified gc_lang/fr/webext/content_scripts/menu.js from [562aee0f70] to [f330b67949].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global oGrammalecte, showError, window, document */ "use strict"; class GrammalecteButton { constructor () { // the pearl button this.xButton = oGrammalecte.createNode("div", { className: "grammalecte_menu_main_button", textContent: " " }); this.xButton.onclick = () => { | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global oGrammalecte, showError, window, document */ "use strict"; class GrammalecteButton { constructor () { // the pearl button this.xButton = oGrammalecte.createNode("div", { className: "grammalecte_menu_main_button", textContent: " " }); this.xButton.onclick = () => { |
︙ | ︙ | |||
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | this._bEditableNode = oOptions.ui_options.editablenode; } } examineNode (xNode) { if (xNode && xNode instanceof HTMLElement) { if (xNode === this.xTextNode) { return; } if ( ( (xNode.tagName == "TEXTAREA" && this._bTextArea && xNode.getAttribute("spellcheck") !== "false") || (xNode.isContentEditable && this._bEditableNode) || (xNode.tagName == "IFRAME" && this._bIframe) ) && xNode.style.display !== "none" && xNode.style.visibility !== "hidden" && !(xNode.dataset.grammalecte_button && xNode.dataset.grammalecte_button == "false") ) { this.xTextNode = xNode; this.show() } } else { this.xTextNode = null; this.hide(); } } show () { if (this.xTextNode) { this.xButton.style.display = "none"; // we hide it before showing it again to relaunch the animation | > > > > > < < | < > > > > > > > > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | this._bEditableNode = oOptions.ui_options.editablenode; } } examineNode (xNode) { if (xNode && xNode instanceof HTMLElement) { if (xNode === this.xTextNode) { this.move(); return; } if ( ( (xNode.tagName == "TEXTAREA" && this._bTextArea && xNode.getAttribute("spellcheck") !== "false") || (xNode.isContentEditable && this._bEditableNode) || (xNode.tagName == "IFRAME" && this._bIframe) ) && xNode.style.display !== "none" && xNode.style.visibility !== "hidden" && !(xNode.dataset.grammalecte_button && xNode.dataset.grammalecte_button == "false") ) { this.xTextNode = xNode; this.show() } else { this.xTextNode = null; this.hide(); } } else { this.xTextNode = null; this.hide(); } } show () { if (this.xTextNode) { this.xButton.style.display = "none"; // we hide it before showing it again to relaunch the animation this.move(); this.xButton.style.display = "block"; } } hide () { this.xButton.style.display = "none"; } move () { if (this.xTextNode) { let oCoord = oGrammalecte.getElementCoord(this.xTextNode); this.xButton.style.top = `${oCoord.bottom}px`; this.xButton.style.left = `${oCoord.left}px`; } } insertIntoPage () { this.bShadow = document.body.createShadowRoot || document.body.attachShadow; if (this.bShadow) { this.xShadowBtn = oGrammalecte.createNode("div", { style: "display:none; position:absolute; width:0; height:0;" }); this.xShadowBtnNode = this.xShadowBtn.attachShadow({ mode: "open" }); oGrammalecte.createStyle("content_scripts/menu.css", null, this.xShadowBtnNode); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel.js from [98261d40f5] to [8de62f65f5].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | this.nWidth = nWidth; this.nHeight = nHeight; this.bFlexible = bFlexible; this.bHorizStrech = false; this.bVertStrech = false; this.nPositionX = 2; this.nPositionY = 2; this.bWorking = false; this.bShadow = document.body.createShadowRoot || document.body.attachShadow; if (this.bShadow) { this.xShadowPanel = oGrammalecte.createNode("div", {id: this.sId+"_shadow", style: "width:0;height:0;"}); this.xShadow = this.xShadowPanel.attachShadow({mode: "open"}); this.xParent = this.xShadow; | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | this.nWidth = nWidth; this.nHeight = nHeight; this.bFlexible = bFlexible; this.bHorizStrech = false; this.bVertStrech = false; this.nPositionX = 2; this.nPositionY = 2; this.bOpened = false; this.bWorking = false; this.bShadow = document.body.createShadowRoot || document.body.attachShadow; if (this.bShadow) { this.xShadowPanel = oGrammalecte.createNode("div", {id: this.sId+"_shadow", style: "width:0;height:0;"}); this.xShadow = this.xShadowPanel.attachShadow({mode: "open"}); this.xParent = this.xShadow; |
︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | } document.body.appendChild(this.xPanel); } } show () { this.xPanel.style.display = "flex"; } hide () { this.xPanel.style.display = "none"; } center () { this.nPosition = 5; this.setSizeAndPosition(); } | > > | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | } document.body.appendChild(this.xPanel); } } show () { this.xPanel.style.display = "flex"; this.bOpened = true; } hide () { this.xPanel.style.display = "none"; this.bOpened = false; } center () { this.nPosition = 5; this.setSizeAndPosition(); } |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.js from [e6011e0390] to [ec198a43f7].
︙ | ︙ | |||
271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | } endTimer () { window.clearTimeout(this.nTimer); } recheckParagraph (iParaNum) { let sParagraphId = "grammalecte_paragraph" + iParaNum; let xParagraph = this.xParent.getElementById(sParagraphId); this._blockParagraph(xParagraph); let sText = this.purgeText(xParagraph.textContent); oGrammalecteBackgroundPort.parseAndSpellcheck1(sText, "__GrammalectePanel__", sParagraphId); this.oTextControl.setParagraph(iParaNum, sText); this.oTextControl.write(); } refreshParagraph (sParagraphId, oResult) { // function called when results are sent by the Worker try { let xParagraph = this.xParent.getElementById(sParagraphId); // save caret position let [nStart, nEnd] = oGrammalecte.getCaretPosition(xParagraph); xParagraph.dataset.caret_position_start = nStart; xParagraph.dataset.caret_position_end = nEnd; // erase texte | > > > > > > | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | } endTimer () { window.clearTimeout(this.nTimer); } recheckParagraph (iParaNum) { if (!this.bOpened) { return; } let sParagraphId = "grammalecte_paragraph" + iParaNum; let xParagraph = this.xParent.getElementById(sParagraphId); this._blockParagraph(xParagraph); let sText = this.purgeText(xParagraph.textContent); oGrammalecteBackgroundPort.parseAndSpellcheck1(sText, "__GrammalectePanel__", sParagraphId); this.oTextControl.setParagraph(iParaNum, sText); this.oTextControl.write(); } refreshParagraph (sParagraphId, oResult) { // function called when results are sent by the Worker if (!this.bOpened) { return; } try { let xParagraph = this.xParent.getElementById(sParagraphId); // save caret position let [nStart, nEnd] = oGrammalecte.getCaretPosition(xParagraph); xParagraph.dataset.caret_position_start = nStart; xParagraph.dataset.caret_position_end = nEnd; // erase texte |
︙ | ︙ | |||
1036 1037 1038 1039 1040 1041 1042 | } write () { if (this.xNode !== null) { if (this.bResultInEvent) { const xEvent = new CustomEvent("GrammalecteResult", { detail: JSON.stringify({ sType: "text", sText: this.getText() }) }); this.xNode.dispatchEvent(xEvent); | | > > > > | | 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 | } write () { if (this.xNode !== null) { if (this.bResultInEvent) { const xEvent = new CustomEvent("GrammalecteResult", { detail: JSON.stringify({ sType: "text", sText: this.getText() }) }); this.xNode.dispatchEvent(xEvent); console.log("[Grammalecte debug] Text sent to xNode via event:", xEvent.detail); } else if (this.bTextArea) { this.xNode.value = this.getText(); console.log("[Grammalecte debug] text written in textarea:", this.getText()); } else if (this.bIframe) { //console.log(this.getText()); } else { let sText = ""; this.eraseNodeContent(); this.dParagraph.forEach((val, key) => { this.xNode.appendChild(document.createTextNode(val.normalize("NFC"))); this.xNode.appendChild(document.createElement("br")); sText += val.normalize("NFC") + "\n"; }); console.log("[Grammalecte debug] text written in editable node:", sText); } } else if (this.xResultNode !== null) { const xEvent = new CustomEvent("GrammalecteResult", { detail: JSON.stringify({ sType: "text", sText: this.getText() }) }); this.xResultNode.dispatchEvent(xEvent); console.log("[Grammalecte debug] Text sent to xResultNode via event:", xEvent.detail); } } } |