Overview
Comment: | [fx] NodeControl -> TextControl: TextFormatter available for every cases |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | fx |
Files: | files | file ages | folders |
SHA3-256: |
d899cb945fc4fef2056dae471cbab8fb |
User & Date: | olr on 2019-05-10 18:21:10 |
Other Links: | manifest | tags |
Context
2019-05-10
| ||
18:56 | [fx] code cleaning check-in: b03eadae9f user: olr tags: trunk, fx | |
18:21 | [fx] NodeControl -> TextControl: TextFormatter available for every cases check-in: d899cb945f user: olr tags: trunk, fx | |
08:51 | [fx] gc panel: new message panel check-in: 862a024977 user: olr tags: trunk, fx | |
Changes
Modified gc_lang/fr/webext/background.js from [dc80f683a6] to [0c479183a2].
︙ | ︙ | |||
300 301 302 303 304 305 306 | // xInfo = https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/contextMenus/OnClickData // xTab = https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/Tab // confusing: no way to get the node where we click?! switch (xInfo.menuItemId) { // analyze case "grammar_checker_editable": case "grammar_checker_page": | | | | 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | // xInfo = https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/contextMenus/OnClickData // xTab = https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/Tab // confusing: no way to get the node where we click?! switch (xInfo.menuItemId) { // analyze case "grammar_checker_editable": case "grammar_checker_page": sendCommandToTab(xTab.id, xInfo.menuItemId); break; case "grammar_checker_selection": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.selectionText); xGCEWorker.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: xInfo.selectionText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {iReturnPort: xTab.id} }); break; // tools |
︙ | ︙ | |||
384 385 386 387 388 389 390 | function storeGCOptions (dOptions) { if (dOptions instanceof Map) { dOptions = helpers.mapToObject(dOptions); } browser.storage.local.set({"gc_options": dOptions}); } | | | | 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | function storeGCOptions (dOptions) { if (dOptions instanceof Map) { dOptions = helpers.mapToObject(dOptions); } browser.storage.local.set({"gc_options": dOptions}); } function sendCommandToTab (iTab, sCommand, result=null) { let xTabPort = dConnx.get(iTab); xTabPort.postMessage({sActionDone: sCommand, result: result, dInfo: null, bEnd: false, bError: false}); } function sendCommandToCurrentTab (sCommand) { if (bChrome) { browser.tabs.query({ currentWindow: true, active: true }, (lTabs) => { for (let xTab of lTabs) { console.log(xTab); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/init.js from [f089b29107] to [aa785e1a1b].
1 2 3 4 | // Modify page /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ | | | 1 2 3 4 5 6 7 8 9 10 11 12 | // Modify page /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, GrammalecteButton, GrammalecteTextFormatter, GrammalecteGrammarChecker, GrammalecteMessageBox, showError, MutationObserver, chrome, document, console */ /* JS sucks (again, and again, and again, and again…) Not possible to load content from within the extension: https://bugzilla.mozilla.org/show_bug.cgi?id=1267027 No SharedWorker, no images allowed for now… */ |
︙ | ︙ | |||
137 138 139 140 141 142 143 | this.createButtons(); }, createTFPanel: function () { if (this.oTFPanel === null) { this.oTFPanel = new GrammalecteTextFormatter("grammalecte_tf_panel", "Formateur de texte", 760, 595, false); this.oTFPanel.insertIntoPage(); | < | | > > > > > > > > < < < < < < < < < < < < < < < | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | this.createButtons(); }, createTFPanel: function () { if (this.oTFPanel === null) { this.oTFPanel = new GrammalecteTextFormatter("grammalecte_tf_panel", "Formateur de texte", 760, 595, false); this.oTFPanel.insertIntoPage(); } }, createGCPanel: function () { if (this.oGCPanel === null) { this.oGCPanel = new GrammalecteGrammarChecker("grammalecte_gc_panel", "Grammalecte", 540, 700); this.oGCPanel.insertIntoPage(); } }, createMessageBox: function () { if (this.oMessageBox === null) { this.oMessageBox = new GrammalecteMessageBox("grammalecte_message_box", "Grammalecte"); this.oMessageBox.insertIntoPage(); } }, startGCPanel: function (what, bCheckText=true) { this.createGCPanel(); this.oGCPanel.clear(); this.oGCPanel.show(); this.oGCPanel.showEditor(); this.oGCPanel.start(what); this.oGCPanel.startWaitIcon(); if (what && bCheckText) { let sText = this.oGCPanel.oTextControl.getText(); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: (what.nodeType && what.nodeType === 1) ? {sTextAreaId: what.id} : {} }); } }, showMessage: function (sMessage) { this.createMessageBox(); this.oMessageBox.show(); this.oMessageBox.setMessage(sMessage); }, getPageText: function () { let sPageText = document.body.innerText; let nPos = sPageText.indexOf("__grammalecte_panel__"); if (nPos >= 0) { sPageText = sPageText.slice(0, nPos).normalize("NFC"); } return sPageText; |
︙ | ︙ | |||
336 337 338 339 340 341 342 | /* Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "grammar_checker_editable": if (oGrammalecte.xRightClickedNode !== null) { | | | | | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | /* Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "grammar_checker_editable": if (oGrammalecte.xRightClickedNode !== null) { oGrammalecte.startGCPanel(oGrammalecte.xRightClickedNode); } else { oGrammalecte.showMessage("Erreur. Le node sur lequel vous avez cliqué n’a pas pu être identifié. Sélectionnez le texte à corriger et relancez le correcteur via le menu contextuel."); } break; case "grammar_checker_page": oGrammalecte.startGCPanel(oGrammalecte.getPageText()); break; case "grammar_checker_selection": oGrammalecte.startGCPanel(result, false); // result is the selected text // selected text is sent to the GC worker in the background script. break; // rescan page command case "rescanPage": oGrammalecte.rescanPage(); break; } |
︙ | ︙ | |||
368 369 370 371 372 373 374 | let xActiveNode = document.activeElement; switch (sActionRequest) { /* Commands received from the keyboard (shortcuts) */ case "shortcutGrammarChecker": if (xActiveNode && (xActiveNode.tagName == "TEXTAREA" || xActiveNode.tagName == "INPUT" || xActiveNode.isContentEditable)) { | | | | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 | let xActiveNode = document.activeElement; switch (sActionRequest) { /* Commands received from the keyboard (shortcuts) */ case "shortcutGrammarChecker": if (xActiveNode && (xActiveNode.tagName == "TEXTAREA" || xActiveNode.tagName == "INPUT" || xActiveNode.isContentEditable)) { oGrammalecte.startGCPanel(xActiveNode); } else { oGrammalecte.startGCPanel(oGrammalecte.getPageText()); } break; default: console.log("[Content script] Unknown command: " + sActionDone); } }); |
Modified gc_lang/fr/webext/content_scripts/menu.js from [7dabc515cf] to [3239a1b7a1].
︙ | ︙ | |||
9 10 11 12 13 14 15 | class GrammalecteButton { constructor (nMenu, xNode) { this.xNode = xNode; this.xButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_main_button", textContent: " "}); this.xButton.onclick = () => { | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | class GrammalecteButton { constructor (nMenu, xNode) { this.xNode = xNode; this.xButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_main_button", textContent: " "}); this.xButton.onclick = () => { oGrammalecte.startGCPanel(this.xNode); }; this.xButton.style.zIndex = (xNode.style.zIndex.search(/^[0-9]+$/) !== -1) ? (parseInt(xNode.style.zIndex) + 1).toString() : xNode.style.zIndex; 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"}); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel.css from [f4fd34834d] to [01f34713fd].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /* CSS Content panels for Grammalecte */ div.grammalecte_panel { all: initial; padding: 0; margin: 0; position: fixed; box-sizing: content-box; z-index: 2147483641; /* maximum is 2147483647: https://stackoverflow.com/questions/491052/minimum-and-maximum-value-of-z-index */ border: 2px solid hsl(210, 50%, 50%); border-radius: 10px 10px 10px 10px; background-color: hsl(210, 0%, 100%); color: hsl(0, 0%, 0%); font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; | > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | /* CSS Content panels for Grammalecte */ div.grammalecte_panel { all: initial; padding: 0; margin: 0; position: fixed; /* flexbox */ display: flex; justify-content: flex-start; flex-direction: column; align-items: stretch; /* end flexbox */ box-sizing: content-box; z-index: 2147483641; /* maximum is 2147483647: https://stackoverflow.com/questions/491052/minimum-and-maximum-value-of-z-index */ border: 2px solid hsl(210, 50%, 50%); border-radius: 10px 10px 10px 10px; background-color: hsl(210, 0%, 100%); color: hsl(0, 0%, 0%); font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; |
︙ | ︙ | |||
26 27 28 29 30 31 32 | display: inline-block; margin: 0; padding: 0; } div.grammalecte_panel_bar { position: sticky; | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | display: inline-block; margin: 0; padding: 0; } div.grammalecte_panel_bar { position: sticky; /*width: 100%;*/ background-color: hsl(210, 50%, 50%); border-radius: 10px 10px 0 0; border-bottom: 1px solid hsl(210, 20%, 86%); } div.grammalecte_panel_title { padding: 3px 20px; |
︙ | ︙ | |||
108 109 110 111 112 113 114 | } div.grammalecte_menu_button:hover { background-color: hsl(210, 80%, 40%); } div.grammalecte_panel_content { | < | < | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | } div.grammalecte_menu_button:hover { background-color: hsl(210, 80%, 40%); } div.grammalecte_panel_content { flex-grow: 1; overflow: auto; } div#grammalecte_panel_message_block { display: none; padding: 10px; background-color: hsl(0, 50%, 50%); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel.js from [b922bcc025] to [22a401fc27].
︙ | ︙ | |||
126 127 128 129 130 131 132 | oGrammalecte.createStyle("content_scripts/panel_tf.css", null, document.head); } document.body.appendChild(this.xPanel); } } show () { | | < | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | oGrammalecte.createStyle("content_scripts/panel_tf.css", null, document.head); } document.body.appendChild(this.xPanel); } } show () { this.xPanel.style.display = "flex"; } hide () { this.xPanel.style.display = "none"; } center () { let nHeight = (this.bFlexible) ? window.innerHeight-100 : this.nHeight; this.setSizeAndPosition(`${this.nWidth}px`, `${nHeight}px`, "50%", "", "", "50%", `-${nHeight/2}px`, `-${this.nWidth/2}px`); } |
︙ | ︙ | |||
176 177 178 179 180 181 182 | this.xPanel.style.marginLeft = sMarginLeft; } reduce () { // todo } | < < < < < | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | this.xPanel.style.marginLeft = sMarginLeft; } reduce () { // todo } getWidth () { return this.xPanelContent.offsetWidth; } logInnerHTML () { // for debugging console.log(this.xPanel.innerHTML); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.js from [410ff2e6bf] to [a133afff43].
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 | constructor (...args) { super(...args); this.aIgnoredErrors = new Set(); this.createMenu() // Editor this.xGCPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_gc_panel_content"}); this.xParagraphList = oGrammalecte.createNode("div", {id: "grammalecte_paragraph_list"}); this.xGCPanelContent.appendChild(this.xParagraphList); this.xPanelContent.addEventListener("click", onGrammalecteGCPanelClick, false); this.oTooltip = new GrammalecteTooltip(this.xParent, this.xGCPanelContent); this.xPanelContent.appendChild(this.xGCPanelContent); this.xNode = null; | > | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | constructor (...args) { super(...args); this.aIgnoredErrors = new Set(); this.createMenu() // Editor this.xGCPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_gc_panel_content"}); this.xGCPanelContent.style.marginBottom = "10px"; this.xParagraphList = oGrammalecte.createNode("div", {id: "grammalecte_paragraph_list"}); this.xGCPanelContent.appendChild(this.xParagraphList); this.xPanelContent.addEventListener("click", onGrammalecteGCPanelClick, false); this.oTooltip = new GrammalecteTooltip(this.xParent, this.xGCPanelContent); this.xPanelContent.appendChild(this.xGCPanelContent); this.xNode = null; this.oTextControl = new GrammalecteTextControl(); // Lexicographer this.nLxgCount = 0; this.xLxgPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_lxg_panel_content"}); this.xPanelContent.appendChild(this.xLxgPanelContent); // Conjugueur this.xConjPanelContent = oGrammalecte.createNode("div", {id: "grammalecte_conj_panel_content"}); this.xConjPanelContent.innerHTML = sGrammalecteConjugueurHTML; // @Reviewers: sGrammalecteConjugueurHTML is a const value defined in <content_scripts/html_src.js> |
︙ | ︙ | |||
77 78 79 80 81 82 83 | this.xTFButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Formateur de texte"}); this.xEditorButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Éditeur"}); this.xLxgButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Lexicographe"}); this.xConjButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Conjugueur"}); this.xLEButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "•Éditeur lexical•"}); this.xTFButton.onclick = () => { if (!this.bWorking) { | < | | | < < < | | < > > > | | > > | < < > | > > > | < < < < < < < < | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | this.xTFButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Formateur de texte"}); this.xEditorButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Éditeur"}); this.xLxgButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Lexicographe"}); this.xConjButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "Conjugueur"}); this.xLEButton = oGrammalecte.createNode("div", {className: "grammalecte_menu_button", textContent: "•Éditeur lexical•"}); this.xTFButton.onclick = () => { if (!this.bWorking) { oGrammalecte.createTFPanel(); oGrammalecte.oTFPanel.start(); oGrammalecte.oTFPanel.show(); } }; this.xEditorButton.onclick = () => { if (!this.bWorking) { this.showEditor(); } }; this.xLxgButton.onclick = () => { if (!this.bWorking) { this.showLexicographer(); this.clearLexicographer(); this.startWaitIcon(); xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: {sText: this.oTextControl.getText()}, dInfo: ((this.xNode) ? {sTextAreaId: this.xNode.id} : {}) }); } }; this.xConjButton.onclick = () => { if (!this.bWorking) { this.showConjugueur(); } }; this.xLEButton.onclick = () => { xGrammalectePort.postMessage({sCommand: "openLexiconEditor", dParam: null, dInfo: null}); }; this.xMenu.appendChild(this.xTFButton) this.xMenu.appendChild(this.xEditorButton) this.xMenu.appendChild(this.xLxgButton) this.xMenu.appendChild(this.xConjButton) this.xMenu.appendChild(this.xLEButton) this.xPanelBar.appendChild(this.xMenu); } start (what) { this.oTooltip.hide(); this.bWorking = false; this.clear(); this.hideMessage(); if (typeof(what) === "string") { // text this.xNode = null; this.oTextControl.setText(what); } else if (what.nodeType && what.nodeType === 1) { // node this.xNode = what; this.oTextControl.setNode(this.xNode); } else { // error oGrammalecte.oMessageBox.showMessage("[BUG] Analyse d’un élément inconnu…"); console.log("Grammalecte [bug]:", what); } } recheckAll () { this.oTooltip.hide(); this.showEditor(); this.clear(); this.startWaitIcon(); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: this.oTextControl.getText(), sCountry: "FR", bDebug: false, bContext: false}, dInfo: ((this.xNode) ? {sTextAreaId: this.xNode.id} : {}) }); } showEditor () { this.switchContentOn(this.xGCPanelContent, this.xEditorButton); this.switchContentOff(this.xLxgPanelContent, this.xLxgButton); this.switchContentOff(this.xConjPanelContent, this.xConjButton); } showLexicographer () { |
︙ | ︙ | |||
195 196 197 198 199 200 201 202 | while (this.xParagraphList.firstChild) { this.xParagraphList.removeChild(this.xParagraphList.firstChild); } this.aIgnoredErrors.clear(); } hide () { this.xPanel.style.display = "none"; | > > > | | | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | while (this.xParagraphList.firstChild) { this.xParagraphList.removeChild(this.xParagraphList.firstChild); } this.aIgnoredErrors.clear(); } hide () { if (oGrammalecte.oTFPanel) { oGrammalecte.oTFPanel.hide(); } if (oGrammalecte.oMessageBox) { oGrammalecte.oMessageBox.hide(); } oGrammalecte.clearRightClickedNode(); this.xPanel.style.display = "none"; this.oTextControl.clear(); } addParagraphResult (oResult) { try { if (oResult && (oResult.sParagraph.trim() !== "" || oResult.aGrammErr.length > 0 || oResult.aSpellErr.length > 0)) { let xNodeDiv = oGrammalecte.createNode("div", {className: "grammalecte_paragraph_block"}); // actions let xActionsBar = oGrammalecte.createNode("div", {className: "grammalecte_paragraph_actions"}); xActionsBar.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_check" + oResult.iParaNum, className: "grammalecte_paragraph_button grammalecte_green", textContent: "↻", title: "Réanalyser…"}, {para_num: oResult.iParaNum})); xActionsBar.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_hide" + oResult.iParaNum, className: "grammalecte_paragraph_button grammalecte_red", textContent: "×", title: "Cacher", style: "font-weight: bold;"})); // paragraph let xParagraph = oGrammalecte.createNode("p", {id: "grammalecte_paragraph"+oResult.iParaNum, className: "grammalecte_paragraph", lang: "fr", contentEditable: "true"}, {para_num: oResult.iParaNum}); xParagraph.setAttribute("spellcheck", "false"); // doesn’t seem possible to use “spellcheck” as a common attribute. xParagraph.dataset.timer_id = "0"; xParagraph.addEventListener("input", function (xEvent) { window.clearTimeout(parseInt(xParagraph.dataset.timer_id)); xParagraph.dataset.timer_id = window.setTimeout(this.recheckParagraph.bind(this), 3000, oResult.iParaNum); let [nStart, nEnd] = oGrammalecte.getCaretPosition(xParagraph); xParagraph.dataset.caret_position_start = nStart; xParagraph.dataset.caret_position_end = nEnd; this.oTextControl.setParagraph(parseInt(xEvent.target.dataset.para_num), this.purgeText(xEvent.target.textContent)); this.oTextControl.write(); }.bind(this) , true); this._tagParagraph(xParagraph, oResult.sParagraph, oResult.iParaNum, oResult.aGrammErr, oResult.aSpellErr); // creation xNodeDiv.appendChild(xActionsBar); xNodeDiv.appendChild(xParagraph); this.xParagraphList.appendChild(xNodeDiv); |
︙ | ︙ | |||
243 244 245 246 247 248 249 | this.blockParagraph(xParagraph); let sText = this.purgeText(xParagraph.textContent); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck1", dParam: {sText: sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {sParagraphId: sParagraphId} }); | | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | this.blockParagraph(xParagraph); let sText = this.purgeText(xParagraph.textContent); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck1", dParam: {sText: sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {sParagraphId: sParagraphId} }); this.oTextControl.setParagraph(iParaNum, sText); this.oTextControl.write(); } refreshParagraph (sParagraphId, oResult) { try { let xParagraph = this.xParent.getElementById(sParagraphId); xParagraph.className = (oResult.aGrammErr.length || oResult.aSpellErr.length) ? "grammalecte_paragraph softred" : "grammalecte_paragraph"; xParagraph.textContent = ""; |
︙ | ︙ | |||
710 711 712 713 714 715 716 | constructor (xParent, xGCPanelContent) { this.xParent = xParent; this.sErrorId = null; this.bDebug = false; this.xTooltip = oGrammalecte.createNode("div", {id: "grammalecte_tooltip"}); this.xTooltipArrow = oGrammalecte.createNode("img", { id: "grammalecte_tooltip_arrow", | | | 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 | constructor (xParent, xGCPanelContent) { this.xParent = xParent; this.sErrorId = null; this.bDebug = false; this.xTooltip = oGrammalecte.createNode("div", {id: "grammalecte_tooltip"}); this.xTooltipArrow = oGrammalecte.createNode("img", { id: "grammalecte_tooltip_arrow", src: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xNzNun2MAAAAnSURBVChTY/j//z8cq/kW/wdhZDEMSXRFWCVhGKwAmwQyHngFxf8B5fOGYfeFpYoAAAAASUVORK5CYII=", alt: "^", }); // message let xMessageBlock = oGrammalecte.createNode("div", {id: "grammalecte_tooltip_message_block"}); xMessageBlock.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_tooltip_rule_id"})); xMessageBlock.appendChild(oGrammalecte.createNode("div", {id: "grammalecte_tooltip_message", textContent: "Erreur."})); this.xTooltip.appendChild(xMessageBlock); |
︙ | ︙ | |||
866 867 868 869 870 871 872 | xSuggBlock.appendChild(document.createTextNode("# Oups. Le mécanisme de suggestion orthographique a rencontré un bug… (Ce module est encore en phase β.)")); showError(e); } } } | | > > > > > > > > > | > > > > > > > > < | | | < | | | | | | | | | | | | | | | > | < < < | | | 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 | xSuggBlock.appendChild(document.createTextNode("# Oups. Le mécanisme de suggestion orthographique a rencontré un bug… (Ce module est encore en phase β.)")); showError(e); } } } class GrammalecteTextControl { constructor () { this.xNode = null; this.dParagraph = new Map(); this.bTextArea = null; } setNode (xNode) { this.clear(); this.xNode = xNode; this.bTextArea = (xNode.tagName == "TEXTAREA" || xNode.tagName == "INPUT"); if (!this.bTextArea) { oGrammalecte.oGCPanel.showMessage("La zone de texte analysée est un champ textuel enrichi susceptible de contenir des éléments non textuels qui seront effacés lors de la correction."); } this.xNode.disabled = true; this.loadText((this.bTextArea) ? this.xNode.value : this.xNode.innerText); } setText (sText) { this.clear(); oGrammalecte.oGCPanel.showMessage("Le texte analysé n’appartient pas à un champ textuel défini. Les modifications ne seront pas répercutées sur la zone d’où le texte a été extrait. Vous pouvez néanmoins récupérer l’ensemble du texte corrigé avec le bouton 📋."); this.loadText(sText); } clear () { if (this.xNode !== null) { this.xNode.disabled = false; this.bTextArea = false; this.xNode = null; } this.dParagraph.clear(); } getText () { let sText = ""; this.dParagraph.forEach(function (val, key) { sText += val + "\n"; }); return sText.slice(0,-1).normalize("NFC"); } setParagraph (iParagraph, sText) { this.dParagraph.set(iParagraph, sText); } loadText (sText) { if (typeof(sText) === "string") { let i = 0; let iStart = 0; let iEnd = 0; sText = sText.replace(/\r\n/g, "\n").replace(/\r/g, "\n").normalize("NFC"); while ((iEnd = sText.indexOf("\n", iStart)) !== -1) { this.dParagraph.set(i, sText.slice(iStart, iEnd)); i++; iStart = iEnd+1; } this.dParagraph.set(i, sText.slice(iStart)); //console.log("Paragraphs number: " + (i+1)); } } eraseNodeContent () { while (this.xNode.firstChild) { this.xNode.removeChild(this.xNode.firstChild); } } write () { if (this.xNode !== null) { let sText = ""; if (this.bTextArea) { this.xNode.value = this.getText(); } else { this.eraseNodeContent(); this.dParagraph.forEach((val, key) => { this.xNode.appendChild(document.createTextNode(val.normalize("NFC"))); this.xNode.appendChild(document.createElement("br")); }); } } } } |
Modified gc_lang/fr/webext/content_scripts/panel_tf.js from [6794ec1e36] to [c58813ca49].
︙ | ︙ | |||
10 11 12 13 14 15 16 | class GrammalecteTextFormatter extends GrammalectePanel { constructor (...args) { super(...args); this.xTFNode = this._createTextFormatter(); this.xPanelContent.appendChild(this.xTFNode); | < | | | | | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | class GrammalecteTextFormatter extends GrammalectePanel { constructor (...args) { super(...args); this.xTFNode = this._createTextFormatter(); this.xPanelContent.appendChild(this.xTFNode); this.xPanel.style.zIndex = 2147483647; /* maximum is 2147483647: https://stackoverflow.com/questions/491052/minimum-and-maximum-value-of-z-index */ this.bTextChanged = false; this.oTextFormatter = new TextFormatter(); this.formatText = this.oTextFormatter.formatTextRuleCount; this.removeHyphenAtEndOfParagraphs = this.oTextFormatter.removeHyphenAtEndOfParagraphsCount; this.mergeContiguousParagraphs = this.oTextFormatter.mergeContiguousParagraphsCount; this.getParagraph = this.oTextFormatter.getParagraph; this.xCloseButton.onclick = () => { this.hide(); if (this.bTextChanged) { oGrammalecte.oGCPanel.recheckAll(); this.bTextChanged = false; } }; } _createTextFormatter () { let xTFNode = document.createElement("div"); |
︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 | _createOrdinalOptions () { let xLine = oGrammalecte.createNode("div", {className: "grammalecte_tf_blockopt grammalecte_tf_underline"}); xLine.appendChild(this._createOption("o_ordinals_no_exponant", true, "Ordinaux (15e, XXIe…)")); xLine.appendChild(this._createOption("o_ordinals_exponant", true, "e → ᵉ")); xLine.appendChild(oGrammalecte.createNode("div", {id: "res_"+"o_ordinals_no_exponant", className: "grammalecte_tf_result", textContent: "·"})); return xLine; } /* Actions */ | > | < < < | | | | | | | | > > > | < | > > > > > > | > > | < < < < < < | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | _createOrdinalOptions () { let xLine = oGrammalecte.createNode("div", {className: "grammalecte_tf_blockopt grammalecte_tf_underline"}); xLine.appendChild(this._createOption("o_ordinals_no_exponant", true, "Ordinaux (15e, XXIe…)")); xLine.appendChild(this._createOption("o_ordinals_exponant", true, "e → ᵉ")); xLine.appendChild(oGrammalecte.createNode("div", {id: "res_"+"o_ordinals_no_exponant", className: "grammalecte_tf_result", textContent: "·"})); return xLine; } /* Actions */ start () { if (bChrome) { browser.storage.local.get("tf_options", this.setOptions.bind(this)); } else { let xPromise = browser.storage.local.get("tf_options"); xPromise.then(this.setOptions.bind(this), this.reset.bind(this)); } } setOptions (oOptions) { if (oOptions.hasOwnProperty("tf_options")) { oOptions = oOptions.tf_options; } let elmOpt = this.xParent.getElementById('grammalecte_tf_options'); for (let xOption of elmOpt.getElementsByClassName("grammalecte_tf_option")) { //console.log(xOption.id + " > " + oOptions.hasOwnProperty(xOption.id) + ": " + oOptions[xOption.id] + " [" + xOption.dataset.default + "]"); xOption.dataset.selected = (oOptions.hasOwnProperty(xOption.id)) ? oOptions[xOption.id] : xOption.dataset.default; xOption.className = (xOption.dataset.selected == "true") ? xOption.className.replace("_off", "_on") : xOption.className.replace("_on", "_off"); if (this.xParent.getElementById("res_"+xOption.id) !== null) { this.xParent.getElementById("res_"+xOption.id).textContent = ""; } if (xOption.id.startsWith("o_group_")) { this.switchGroup(xOption.id); } } } switchGroup (sOptName) { if (this.xParent.getElementById(sOptName).dataset.selected == "true") { this.xParent.getElementById(sOptName.slice(2)).style.opacity = 1; } else { this.xParent.getElementById(sOptName.slice(2)).style.opacity = 0.3; |
︙ | ︙ | |||
251 252 253 254 255 256 257 | } resetProgressBar () { this.xParent.getElementById('grammalecte_tf_progressbar').value = 0; this.xParent.getElementById('grammalecte_tf_time_res').textContent = ""; } | < < < < < < < < < < < < < < < < < < | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | } resetProgressBar () { this.xParent.getElementById('grammalecte_tf_progressbar').value = 0; this.xParent.getElementById('grammalecte_tf_time_res').textContent = ""; } saveOptions () { let oOptions = {}; let elmOpt = this.xParent.getElementById('grammalecte_tf_options'); for (let xOption of elmOpt.getElementsByClassName("grammalecte_tf_option")) { oOptions[xOption.id] = (xOption.dataset.selected == "true"); //console.log(xOption.id + ": " + xOption.checked); } |
︙ | ︙ | |||
291 292 293 294 295 296 297 | } apply () { try { const t0 = Date.now(); //window.setCursor("wait"); // change pointer this.resetProgressBar(); | | | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 | } apply () { try { const t0 = Date.now(); //window.setCursor("wait"); // change pointer this.resetProgressBar(); let sText = oGrammalecte.oGCPanel.oTextControl.getText(); this.xParent.getElementById('grammalecte_tf_progressbar').max = 7; let n1 = 0, n2 = 0, n3 = 0, n4 = 0, n5 = 0, n6 = 0, n7 = 0; // Restructuration if (this.isSelected("o_group_struct")) { if (this.isSelected("o_remove_hyphens_at_end_of_paragraphs")) { [sText, n1] = this.removeHyphenAtEndOfParagraphs(sText); |
︙ | ︙ | |||
537 538 539 540 541 542 543 | this.xParent.getElementById('grammalecte_tf_progressbar').value = this.xParent.getElementById('grammalecte_tf_progressbar').max; // end of processing //window.setCursor("auto"); // restore pointer const t1 = Date.now(); this.xParent.getElementById('grammalecte_tf_time_res').textContent = this.getTimeRes((t1-t0)/1000); | | > > | 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 | this.xParent.getElementById('grammalecte_tf_progressbar').value = this.xParent.getElementById('grammalecte_tf_progressbar').max; // end of processing //window.setCursor("auto"); // restore pointer const t1 = Date.now(); this.xParent.getElementById('grammalecte_tf_time_res').textContent = this.getTimeRes((t1-t0)/1000); oGrammalecte.oGCPanel.oTextControl.loadText(sText); oGrammalecte.oGCPanel.oTextControl.write(); this.bTextChanged = true; } catch (e) { showError(e); } } getTimeRes (n) { |
︙ | ︙ |