Changes In Branch shadowdom Through [3da397c601] Excluding Merge-Ins
This is equivalent to a diff from 3e32004d0a to 3da397c601
2018-10-19
| ||
15:48 | [fx] Use shadow for bouton and menu check-in: 30498d19e4 user: IllusionPerdu tags: fx, shadowdom | |
15:07 | [fx] We can expose the css in webpage check-in: 3da397c601 user: IllusionPerdu tags: fx, shadowdom | |
14:57 | [fx] Oups it's not necessary to have sUrl in panel or msgbox check-in: f8cceefa3c user: IllusionPerdu tags: fx, shadowdom | |
14:33 | [fx] Use Shadow DOM in panel when avaible check-in: 41527933de user: IllusionPerdu tags: fx, shadowdom | |
2018-10-18
| ||
11:01 | [fr] nr: issue check-in: 98edfb0735 user: olr tags: trunk, fr | |
2018-10-17
| ||
16:35 | [njs] merge nodejs: build package for NodeJS check-in: 3e32004d0a user: olr tags: trunk, njs | |
16:07 | [njs] fix labels and few mistakes check-in: 23d95509f4 user: olr tags: njs, nodejs | |
2018-10-12
| ||
08:45 | [build] useless path check-in: cc74e8c3a7 user: olr tags: trunk, build | |
Modified gc_lang/fr/webext/background.js from [5ef343fe2e] to [52ec35f9bc].
|
| | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | // Background /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, helpers, showError, Worker, chrome, console */ "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } |
︙ | ︙ | |||
248 249 250 251 252 253 254 255 256 257 258 259 260 261 | break; default: console.log("[background] Unknown command: " + sCommand); console.log(oRequest); } }); //xPort.postMessage({sActionDone: "newId", result: iPortId}); } browser.runtime.onConnect.addListener(handleConnexion); /* Context Menu | > | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | break; default: console.log("[background] Unknown command: " + sCommand); console.log(oRequest); } }); //xPort.postMessage({sActionDone: "newId", result: iPortId}); xPort.postMessage({sActionDone: "init", sUrl: browser.extension.getURL("")}); } browser.runtime.onConnect.addListener(handleConnexion); /* Context Menu |
︙ | ︙ | |||
325 326 327 328 329 330 331 | let xPort = dConnx.get(xTab.id); xPort.postMessage({sActionDone: "rescanPage"}); break; default: console.log("[Background] Unknown menu id: " + xInfo.menuItemId); console.log(xInfo); console.log(xTab); | | | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 | let xPort = dConnx.get(xTab.id); xPort.postMessage({sActionDone: "rescanPage"}); break; default: console.log("[Background] Unknown menu id: " + xInfo.menuItemId); console.log(xInfo); console.log(xTab); } }); /* Keyboard shortcuts */ browser.commands.onCommand.addListener(function (sCommand) { |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/init.js from [4dca1795eb] to [b02978e970].
1 2 3 4 5 6 7 8 9 | // Modify page /* 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… */ | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | // Modify page /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, GrammalecteMenu, GrammalecteTextFormatter, GrammalecteLexicographer, 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… */ |
︙ | ︙ | |||
49 50 51 52 53 54 55 56 57 58 59 60 61 62 | oGCPanel: null, oMessageBox: null, xRightClickedNode: null, xObserver: null, listenRightClick: function () { // Node where a right click is done // Bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1325814 document.addEventListener('contextmenu', function (xEvent) { this.xRightClickedNode = xEvent.target; }.bind(this), true); | > > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | oGCPanel: null, oMessageBox: null, xRightClickedNode: null, xObserver: null, sExtensionUrl: null, listenRightClick: function () { // Node where a right click is done // Bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1325814 document.addEventListener('contextmenu', function (xEvent) { this.xRightClickedNode = xEvent.target; }.bind(this), true); |
︙ | ︙ | |||
206 207 208 209 210 211 212 | } return xNode; } catch (e) { showError(e); } } | | > > > | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | } return xNode; } catch (e) { showError(e); } } }; /* Connexion to the background */ let xGrammalectePort = browser.runtime.connect({name: "content-script port"}); xGrammalectePort.onMessage.addListener(function (oMessage) { let {sActionDone, result, dInfo, bEnd, bError} = oMessage; let sText = ""; switch (sActionDone) { case "init": oGrammalecte.sExtensionUrl = oMessage.sUrl; break; case "parseAndSpellcheck": if (!bEnd) { oGrammalecte.oGCPanel.addParagraphResult(result); } else { oGrammalecte.oGCPanel.stopWaitIcon(); } break; |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/message_box.js from [4f0ad33a4a] to [570e256791].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | // JavaScript // Panel creator "use strict"; class GrammalecteMessageBox { constructor (sId, sTitle) { this.sId = sId; this.xMessageBoxBar = oGrammalecte.createNode("div", {className: "grammalecte_message_box_bar"}); this.xMessageBoxContent = oGrammalecte.createNode("div", {className: "grammalecte_message_box_content"}); this.xMessageBox = this._createPanel(sTitle); } _createPanel (sTitle) { try { | > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | // JavaScript // Panel creator /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global oGrammalecte, xGrammalectePort, showError, window, document, console */ "use strict"; class GrammalecteMessageBox { constructor (sId, sTitle) { this.sId = sId; this.bShadow = document.body.createShadowRoot || document.body.attachShadow; if (this.bShadow){ this.oShadowPanel = oGrammalecte.createNode("div", {id: this.sId+"_shadow", style: "width:0;height:0;"}); this.oShadow = this.oShadowPanel.attachShadow({mode: "open"}); this.oParent = this.oShadow; } else { this.oParent = document; } this.xMessageBoxBar = oGrammalecte.createNode("div", {className: "grammalecte_message_box_bar"}); this.xMessageBoxContent = oGrammalecte.createNode("div", {className: "grammalecte_message_box_content"}); this.xMessageBox = this._createPanel(sTitle); } _createPanel (sTitle) { try { |
︙ | ︙ | |||
46 47 48 49 50 51 52 | _createCloseButton () { let xButton = oGrammalecte.createNode("div", {className: "grammalecte_close_button", textContent: "×", title: "Fermer la fenêtre"}); xButton.onclick = function () { this.hide(); }.bind(this); // better than writing “let that = this;” before the function? return xButton; } insertIntoPage () { | > > > > > > > > > > | > | 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 | _createCloseButton () { let xButton = oGrammalecte.createNode("div", {className: "grammalecte_close_button", textContent: "×", title: "Fermer la fenêtre"}); xButton.onclick = function () { this.hide(); }.bind(this); // better than writing “let that = this;” before the function? return xButton; } insertIntoPage () { if (this.bShadow){ this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/panel.css"}) ); this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/message_box.css"}) ); this.oShadow.appendChild(this.xMessageBox); document.body.appendChild(this.oShadowPanel); } else { document.body.appendChild(this.xMessageBox); } } show () { this.xMessageBox.style.display = "block"; } hide () { |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel.js from [9072191a85] to [c76d6fb8d0].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | // JavaScript // Panel creator "use strict"; class GrammalectePanel { constructor (sId, sTitle, nWidth, nHeight, bFlexible=true) { this.sId = sId; this.nWidth = nWidth; this.nHeight = nHeight; this.bFlexible = bFlexible; this.xPanelBar = oGrammalecte.createNode("div", {className: "grammalecte_panel_bar"}); this.xPanelContent = oGrammalecte.createNode("div", {className: "grammalecte_panel_content"}); this.xWaitIcon = this._createWaitIcon(); this.xPanel = this._createPanel(sTitle); this.center(); } | > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 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 | // JavaScript // Panel creator /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, xGrammalectePort, showError, window, document, console */ "use strict"; class GrammalectePanel { constructor (sId, sTitle, nWidth, nHeight, bFlexible=true) { this.sId = sId; this.nWidth = nWidth; this.nHeight = nHeight; this.bFlexible = bFlexible; this.bShadow = document.body.createShadowRoot || document.body.attachShadow; if (this.bShadow){ this.oShadowPanel = oGrammalecte.createNode("div", {id: this.sId+"_shadow", style: "width:0;height:0;"}); this.oShadow = this.oShadowPanel.attachShadow({mode: "open"}); this.oParent = this.oShadow; } else { this.oParent = document; } this.xPanelBar = oGrammalecte.createNode("div", {className: "grammalecte_panel_bar"}); this.xPanelContent = oGrammalecte.createNode("div", {className: "grammalecte_panel_content"}); this.xWaitIcon = this._createWaitIcon(); this.xPanel = this._createPanel(sTitle); this.center(); } |
︙ | ︙ | |||
79 80 81 82 83 84 85 | _createCloseButton () { let xButton = oGrammalecte.createNode("div", {className: "grammalecte_close_button", textContent: "×", title: "Fermer la fenêtre"}); xButton.onclick = function () { this.hide(); }.bind(this); // better than writing “let that = this;” before the function? return xButton; } insertIntoPage () { | > > > > > > > > > > > > > > > > | > | 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 | _createCloseButton () { let xButton = oGrammalecte.createNode("div", {className: "grammalecte_close_button", textContent: "×", title: "Fermer la fenêtre"}); xButton.onclick = function () { this.hide(); }.bind(this); // better than writing “let that = this;” before the function? return xButton; } insertIntoPage () { if (this.bShadow){ this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/panel.css"}) ); this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/panel_gc.css"}) ); this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/panel_lxg.css"}) ); this.oShadow.appendChild( oGrammalecte.createNode("link", {rel: "stylesheet", type: "text/css", media: "all", href: oGrammalecte.sExtensionUrl + "content_scripts/panel_tf.css"}) ); this.oShadow.appendChild(this.xPanel); document.body.appendChild(this.oShadowPanel); } else { document.body.appendChild(this.xPanel); } } show () { this.xPanel.style.display = "block"; } hide () { |
︙ | ︙ | |||
135 136 137 138 139 140 141 | return this.xPanelContent.offsetWidth; } logInnerHTML () { // for debugging console.log(this.xPanel.innerHTML); } | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | return this.xPanelContent.offsetWidth; } logInnerHTML () { // for debugging console.log(this.xPanel.innerHTML); } startWaitIcon () { this.xWaitIcon.style.visibility = "visible"; } stopWaitIcon () { this.xWaitIcon.style.visibility = "hidden"; } |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.js from [271c87ea03] to [9def947c5d].
1 2 3 4 5 6 7 8 9 | // JavaScript "use strict"; function onGrammalecteGCPanelClick (xEvent) { try { let xElem = xEvent.target; if (xElem.id) { if (xElem.id.startsWith("grammalecte_sugg")) { | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, xGrammalectePort, showError, window, document, console */ "use strict"; function onGrammalecteGCPanelClick (xEvent) { try { let xElem = xEvent.target; if (xElem.id) { if (xElem.id.startsWith("grammalecte_sugg")) { |
︙ | ︙ | |||
46 47 48 49 50 51 52 | constructor (...args) { super(...args); this.aIgnoredErrors = new Set(); this.xContentNode = oGrammalecte.createNode("div", {id: "grammalecte_gc_panel_content"}); this.xParagraphList = oGrammalecte.createNode("div", {id: "grammalecte_paragraph_list"}); this.xContentNode.appendChild(this.xParagraphList); this.xPanelContent.addEventListener("click", onGrammalecteGCPanelClick, false); | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | constructor (...args) { super(...args); this.aIgnoredErrors = new Set(); this.xContentNode = oGrammalecte.createNode("div", {id: "grammalecte_gc_panel_content"}); this.xParagraphList = oGrammalecte.createNode("div", {id: "grammalecte_paragraph_list"}); this.xContentNode.appendChild(this.xParagraphList); this.xPanelContent.addEventListener("click", onGrammalecteGCPanelClick, false); this.oTooltip = new GrammalecteTooltip(this.oParent, this.xContentNode); this.xPanelContent.appendChild(this.xContentNode); this.oNodeControl = new GrammalecteNodeControl(); } start (xNode=null) { this.oTooltip.hide(); this.clear(); |
︙ | ︙ | |||
104 105 106 107 108 109 110 | catch (e) { showError(e); } } recheckParagraph (iParaNum) { let sParagraphId = "grammalecte_paragraph" + iParaNum; | | | | 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 | catch (e) { showError(e); } } recheckParagraph (iParaNum) { let sParagraphId = "grammalecte_paragraph" + iParaNum; let xParagraph = this.oParent.getElementById(sParagraphId); 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.oNodeControl.setParagraph(iParaNum, sText); this.oNodeControl.write(); } refreshParagraph (sParagraphId, oResult) { try { let xParagraph = this.oParent.getElementById(sParagraphId); xParagraph.className = (oResult.aGrammErr.length || oResult.aSpellErr.length) ? "grammalecte_paragraph softred" : "grammalecte_paragraph"; xParagraph.textContent = ""; this._tagParagraph(xParagraph, oResult.sParagraph, sParagraphId.slice(21), oResult.aGrammErr, oResult.aSpellErr); this.freeParagraph(xParagraph); } catch (e) { showError(e); |
︙ | ︙ | |||
191 192 193 194 195 196 197 | xNodeErr.className = (this.aIgnoredErrors.has(xNodeErr.dataset.ignored_key)) ? "grammalecte_error_ignored" : "grammalecte_error"; xNodeErr.style.backgroundColor = (oErr['sType'] === "WORD") ? "hsl(0, 50%, 50%)" : oErr["aColor"]; return xNodeErr; } blockParagraph (xParagraph) { xParagraph.contentEditable = "false"; | | | | | | | | | | | | | 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 231 232 233 234 235 236 237 238 239 240 | xNodeErr.className = (this.aIgnoredErrors.has(xNodeErr.dataset.ignored_key)) ? "grammalecte_error_ignored" : "grammalecte_error"; xNodeErr.style.backgroundColor = (oErr['sType'] === "WORD") ? "hsl(0, 50%, 50%)" : oErr["aColor"]; return xNodeErr; } blockParagraph (xParagraph) { xParagraph.contentEditable = "false"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).textContent = "Analyse…"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).style.backgroundColor = "hsl(0, 50%, 50%)"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).style.boxShadow = "0 0 0 3px hsla(0, 100%, 50%, .2)"; } freeParagraph (xParagraph) { xParagraph.contentEditable = "true"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).textContent = "Réanalyser"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).style.backgroundColor = "hsl(120, 30%, 50%)"; this.oParent.getElementById("grammalecte_check"+xParagraph.dataset.para_num).style.boxShadow = "none"; } applySuggestion (sNodeSuggId) { // sugg try { let sErrorId = this.oParent.getElementById(sNodeSuggId).dataset.error_id; //let sParaNum = sErrorId.slice(0, sErrorId.indexOf("-")); let xNodeErr = this.oParent.getElementById("grammalecte_err" + sErrorId); xNodeErr.textContent = this.oParent.getElementById(sNodeSuggId).textContent; xNodeErr.className = "grammalecte_error_corrected"; xNodeErr.removeAttribute("style"); this.oTooltip.hide(); this.recheckParagraph(parseInt(sErrorId.slice(0, sErrorId.indexOf("-")))); } catch (e) { showError(e); } } ignoreError (sIgnoreButtonId) { // ignore try { let sErrorId = this.oParent.getElementById(sIgnoreButtonId).dataset.error_id; let xNodeErr = this.oParent.getElementById("grammalecte_err" + sErrorId); this.aIgnoredErrors.add(xNodeErr.dataset.ignored_key); xNodeErr.className = "grammalecte_error_ignored"; this.oTooltip.hide(); } catch (e) { showError(e); } |
︙ | ︙ | |||
252 253 254 255 256 257 258 | _copyToClipboard (sText) { // recipe from https://github.com/mdn/webextensions-examples/blob/master/context-menu-copy-link-with-types/clipboard-helper.js function setClipboardData (xEvent) { document.removeEventListener("copy", setClipboardData, true); xEvent.stopImmediatePropagation(); xEvent.preventDefault(); xEvent.clipboardData.setData("text/plain", sText); | < > | | | > | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 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 | _copyToClipboard (sText) { // recipe from https://github.com/mdn/webextensions-examples/blob/master/context-menu-copy-link-with-types/clipboard-helper.js function setClipboardData (xEvent) { document.removeEventListener("copy", setClipboardData, true); xEvent.stopImmediatePropagation(); xEvent.preventDefault(); xEvent.clipboardData.setData("text/plain", sText); } document.addEventListener("copy", setClipboardData, true); document.execCommand("copy"); } copyTextToClipboard () { this.startWaitIcon(); try { let xClipboardButton = this.oParent.getElementById("grammalecte_clipboard_button"); xClipboardButton.textContent = "->>"; let sText = ""; for (let xNode of this.oParent.getElementsByClassName("grammalecte_paragraph")) { sText += xNode.textContent + "\n"; } this._copyToClipboard(sText); xClipboardButton.textContent = "OK"; window.setTimeout(function() { xClipboardButton.textContent = "∑"; } , 2000); } catch (e) { showError(e); } this.stopWaitIcon(); } } class GrammalecteTooltip { constructor (oParent, xContentNode) { this.oParent = oParent; 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: "^", |
︙ | ︙ | |||
312 313 314 315 316 317 318 | // add tooltip to the page xContentNode.appendChild(this.xTooltip); xContentNode.appendChild(this.xTooltipArrow); } show (sNodeErrorId) { // err try { | | | | | | | | | | | | | | | | | | | | | | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | // add tooltip to the page xContentNode.appendChild(this.xTooltip); xContentNode.appendChild(this.xTooltipArrow); } show (sNodeErrorId) { // err try { let xNodeErr = this.oParent.getElementById(sNodeErrorId); this.sErrorId = xNodeErr.dataset.error_id; // we store error_id here to know if spell_suggestions are given to the right word. let nTooltipLeftLimit = oGrammalecte.oGCPanel.getWidth() - 330; // paragraph width - tooltip width let nArrowLimit = oGrammalecte.oGCPanel.getWidth() - 20; this.xTooltipArrow.style.top = (xNodeErr.offsetTop + 16) + "px"; let nUsefulErrorWidth = ((xNodeErr.offsetLeft + xNodeErr.offsetWidth) > nArrowLimit) ? (nArrowLimit - xNodeErr.offsetLeft) : xNodeErr.offsetWidth; this.xTooltipArrow.style.left = (xNodeErr.offsetLeft + Math.floor((nUsefulErrorWidth / 2)) - 4) + "px"; // 4 is half the width of the arrow. this.xTooltip.style.top = (xNodeErr.offsetTop + 20) + "px"; this.xTooltip.style.left = (xNodeErr.offsetLeft > nTooltipLeftLimit) ? nTooltipLeftLimit + "px" : xNodeErr.offsetLeft + "px"; if (xNodeErr.dataset.error_type === "grammar") { // grammar error this.oParent.getElementById("grammalecte_tooltip_db_search").style.display = "none"; if (xNodeErr.dataset.gc_message.includes(" ##")) { this.bDebug = true; // display rule id let n = xNodeErr.dataset.gc_message.indexOf(" ##"); this.oParent.getElementById("grammalecte_tooltip_message").textContent = xNodeErr.dataset.gc_message.slice(0, n); this.oParent.getElementById("grammalecte_tooltip_rule_id").textContent = "Règle : " + xNodeErr.dataset.gc_message.slice(n+2); this.oParent.getElementById("grammalecte_tooltip_rule_id").style.display = "block"; } else { this.bDebug = false; this.oParent.getElementById("grammalecte_tooltip_message").textContent = xNodeErr.dataset.gc_message; this.oParent.getElementById("grammalecte_tooltip_rule_id").style.display = "none"; } if (xNodeErr.dataset.gc_url != "") { this.oParent.getElementById("grammalecte_tooltip_url").dataset.url = xNodeErr.dataset.gc_url; this.oParent.getElementById("grammalecte_tooltip_url").style.display = "inline"; } else { this.oParent.getElementById("grammalecte_tooltip_url").dataset.url = ""; this.oParent.getElementById("grammalecte_tooltip_url").style.display = "none"; } this.oParent.getElementById("grammalecte_tooltip_ignore").dataset.error_id = xNodeErr.dataset.error_id; let iSugg = 0; this.clearSuggestionBlock(); if (xNodeErr.dataset.suggestions.length > 0) { for (let sSugg of xNodeErr.dataset.suggestions.split("|")) { this.xTooltipSuggBlock.appendChild(this._createSuggestion(xNodeErr.dataset.error_id, 0, iSugg, sSugg)); this.xTooltipSuggBlock.appendChild(document.createTextNode(" ")); iSugg += 1; } } else { this.xTooltipSuggBlock.textContent = "Aucune."; } } if (xNodeErr.dataset.error_type === "spelling") { // spelling mistake this.oParent.getElementById("grammalecte_tooltip_message").textContent = "Mot inconnu du dictionnaire."; this.oParent.getElementById("grammalecte_tooltip_ignore").dataset.error_id = xNodeErr.dataset.error_id; this.oParent.getElementById("grammalecte_tooltip_rule_id").style.display = "none"; this.oParent.getElementById("grammalecte_tooltip_url").dataset.url = ""; this.oParent.getElementById("grammalecte_tooltip_url").style.display = "none"; if (this.bDebug) { this.oParent.getElementById("grammalecte_tooltip_db_search").style.display = "inline"; this.oParent.getElementById("grammalecte_tooltip_db_search").dataset.url = "https://www.dicollecte.org/dictionary.php?prj=fr&lemma="+xNodeErr.textContent; } else { this.oParent.getElementById("grammalecte_tooltip_db_search").style.display = "none"; } this.clearSuggestionBlock(); this.xTooltipSuggBlock.textContent = "Recherche de graphies possibles…"; xGrammalectePort.postMessage({ sCommand: "getSpellSuggestions", dParam: {sWord: xNodeErr.textContent}, dInfo: {sErrorId: xNodeErr.dataset.error_id} |
︙ | ︙ | |||
413 414 415 416 417 418 419 | return xNodeSugg; } setSpellSuggestionsFor (sWord, aSugg, iSuggBlock, sErrorId) { // spell checking suggestions try { if (sErrorId === this.sErrorId) { | | | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | return xNodeSugg; } setSpellSuggestionsFor (sWord, aSugg, iSuggBlock, sErrorId) { // spell checking suggestions try { if (sErrorId === this.sErrorId) { let xSuggBlock = this.oParent.getElementById("grammalecte_tooltip_sugg_block"); if (iSuggBlock == 0) { xSuggBlock.textContent = ""; } if (!aSugg || aSugg.length == 0) { if (iSuggBlock == 0) { xSuggBlock.appendChild(document.createTextNode("Aucune.")); } |
︙ | ︙ | |||
435 436 437 438 439 440 441 | xSuggBlock.appendChild(document.createTextNode(" ")); iSugg += 1; } } } } catch (e) { | | | 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | xSuggBlock.appendChild(document.createTextNode(" ")); iSugg += 1; } } } } catch (e) { let xSuggBlock = this.oParent.getElementById("grammalecte_tooltip_sugg_block"); xSuggBlock.appendChild(document.createTextNode("# Oups. Le mécanisme de suggestion orthographique a rencontré un bug… (Ce module est encore en phase β.)")); showError(e); } } } |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_lxg.js from [e03b1fbb30] to [ccd6c248f0].
1 2 3 4 5 6 7 8 9 | // JavaScript "use strict"; class GrammalecteLexicographer extends GrammalectePanel { constructor (...args) { super(...args); | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | // JavaScript /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, showError, console */ "use strict"; class GrammalecteLexicographer extends GrammalectePanel { constructor (...args) { super(...args); |
︙ | ︙ | |||
81 82 83 84 85 86 87 | } catch (e) { showError(e); } } setHidden (sClass, bHidden) { | > | | 85 86 87 88 89 90 91 92 93 94 95 96 97 | } catch (e) { showError(e); } } setHidden (sClass, bHidden) { let elmOpt = this.oParent.getElementById('grammalecte_panel_content'); for (let xNode of elmOpt.getElementsByClassName(sClass)) { xNode.hidden = bHidden; } } } |
Modified gc_lang/fr/webext/content_scripts/panel_tf.js from [30789c132c] to [7dff6ab6d6].
1 2 3 4 5 6 7 8 9 10 | // JavaScript // Text formatter "use strict"; class GrammalecteTextFormatter extends GrammalectePanel { constructor (...args) { super(...args); | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | // JavaScript // Text formatter /* jshint esversion:6, -W097 */ /* jslint esversion:6 */ /* global GrammalectePanel, oGrammalecte, TextFormatter, bChrome, browser, showError, document, console */ "use strict"; class GrammalecteTextFormatter extends GrammalectePanel { constructor (...args) { super(...args); |
︙ | ︙ | |||
178 179 180 181 182 183 184 | let xPromise = browser.storage.local.get("tf_options"); xPromise.then(this.setOptions.bind(this), this.reset.bind(this)); } } } switchGroup (sOptName) { | | | | | | > > | | | > | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 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 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | let xPromise = browser.storage.local.get("tf_options"); xPromise.then(this.setOptions.bind(this), this.reset.bind(this)); } } } switchGroup (sOptName) { if (this.oParent.getElementById(sOptName).dataset.selected == "true") { this.oParent.getElementById(sOptName.slice(2)).style.opacity = 1; } else { this.oParent.getElementById(sOptName.slice(2)).style.opacity = 0.3; } this.resetProgressBar(); } switchOption (sOptName) { let xOption = this.oParent.getElementById(sOptName); if (xOption.dataset.linked_ids === "") { xOption.dataset.selected = (xOption.dataset.selected == "true") ? "false" : "true"; xOption.className = (xOption.dataset.selected == "true") ? xOption.className.replace("_off", "_on") : xOption.className.replace("_on", "_off"); } else { this.setOption(sOptName, true); for (let sOptName of xOption.dataset.linked_ids.split("|")) { this.setOption(sOptName, false); } } } setOption (sOptName, bValue) { let xOption = this.oParent.getElementById(sOptName); xOption.dataset.selected = bValue; xOption.className = (xOption.dataset.selected == "true") ? xOption.className.replace("_off", "_on") : xOption.className.replace("_on", "_off"); } reset () { this.resetProgressBar(); //on Shadow DOM getElementsByClassName don't work directly ;) let elmOpt = this.oParent.getElementById('grammalecte_tf_options'); for (let xOption of elmOpt.getElementsByClassName("grammalecte_tf_option")) { xOption.dataset.selected = xOption.dataset.default; xOption.className = (xOption.dataset.selected == "true") ? xOption.className.replace("_off", "_on") : xOption.className.replace("_on", "_off"); if (xOption.id.startsWith("o_group_")) { this.switchGroup(xOption.id); } } } resetProgressBar () { this.oParent.getElementById('grammalecte_tf_progressbar').value = 0; this.oParent.getElementById('grammalecte_tf_time_res').textContent = ""; } setOptions (oOptions) { if (oOptions.hasOwnProperty("tf_options")) { oOptions = oOptions.tf_options; } let elmOpt = this.oParent.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.oParent.getElementById("res_"+xOption.id) !== null) { this.oParent.getElementById("res_"+xOption.id).textContent = ""; } if (xOption.id.startsWith("o_group_")) { this.switchGroup(xOption.id); } } } saveOptions () { let oOptions = {}; let elmOpt = this.oParent.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); } browser.storage.local.set({"tf_options": oOptions}); } isSelected (sOptName) { if (this.oParent.getElementById(sOptName)) { return (this.oParent.getElementById(sOptName).dataset.selected === "true"); } return false; } apply () { try { const t0 = Date.now(); //window.setCursor("wait"); // change pointer this.resetProgressBar(); let sText = this.xTextArea.value.normalize("NFC"); this.oParent.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); this.oParent.getElementById('res_o_remove_hyphens_at_end_of_paragraphs').textContent = n1; } if (this.isSelected("o_merge_contiguous_paragraphs")) { [sText, n1] = this.mergeContiguousParagraphs(sText); this.oParent.getElementById('res_o_merge_contiguous_paragraphs').textContent = n1; } this.setOption("o_group_struct", false); this.switchGroup("o_group_struct"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 1; // espaces surnuméraires if (this.isSelected("o_group_ssp")) { if (this.isSelected("o_end_of_paragraph")) { [sText, n1] = this.formatText(sText, "end_of_paragraph"); this.oParent.getElementById('res_o_end_of_paragraph').textContent = n1; } if (this.isSelected("o_between_words")) { [sText, n1] = this.formatText(sText, "between_words"); this.oParent.getElementById('res_o_between_words').textContent = n1; } if (this.isSelected("o_start_of_paragraph")) { [sText, n1] = this.formatText(sText, "start_of_paragraph"); this.oParent.getElementById('res_o_start_of_paragraph').textContent = n1; } if (this.isSelected("o_before_punctuation")) { [sText, n1] = this.formatText(sText, "before_punctuation"); this.oParent.getElementById('res_o_before_punctuation').textContent = n1; } if (this.isSelected("o_within_parenthesis")) { [sText, n1] = this.formatText(sText, "within_parenthesis"); this.oParent.getElementById('res_o_within_parenthesis').textContent = n1; } if (this.isSelected("o_within_square_brackets")) { [sText, n1] = this.formatText(sText, "within_square_brackets"); this.oParent.getElementById('res_o_within_square_brackets').textContent = n1; } if (this.isSelected("o_within_quotation_marks")) { [sText, n1] = this.formatText(sText, "within_quotation_marks"); this.oParent.getElementById('res_o_within_quotation_marks').textContent = n1; } this.setOption("o_group_ssp", false); this.switchGroup("o_group_ssp"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 2; // espaces insécables if (this.isSelected("o_group_nbsp")) { if (this.isSelected("o_nbsp_before_punctuation")) { [sText, n1] = this.formatText(sText, "nbsp_before_punctuation"); [sText, n2] = this.formatText(sText, "nbsp_repair"); this.oParent.getElementById('res_o_nbsp_before_punctuation').textContent = n1 - n2; } if (this.isSelected("o_nbsp_within_quotation_marks")) { [sText, n1] = this.formatText(sText, "nbsp_within_quotation_marks"); this.oParent.getElementById('res_o_nbsp_within_quotation_marks').textContent = n1; } if (this.isSelected("o_nbsp_before_symbol")) { [sText, n1] = this.formatText(sText, "nbsp_before_symbol"); this.oParent.getElementById('res_o_nbsp_before_symbol').textContent = n1; } if (this.isSelected("o_nbsp_within_numbers")) { [sText, n1] = this.formatText(sText, "nbsp_within_numbers"); this.oParent.getElementById('res_o_nbsp_within_numbers').textContent = n1; } if (this.isSelected("o_nbsp_before_units")) { [sText, n1] = this.formatText(sText, "nbsp_before_units"); this.oParent.getElementById('res_o_nbsp_before_units').textContent = n1; } if (this.isSelected("o_nbsp_titles")) { [sText, n1] = this.formatText(sText, "nbsp_titles"); this.oParent.getElementById('res_o_nbsp_titles').textContent = n1; } this.setOption("o_group_nbsp", false); this.switchGroup("o_group_nbsp"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 3; // espaces manquants if (this.isSelected("o_group_typo")) { if (this.isSelected("o_ts_units")) { [sText, n1] = this.formatText(sText, "ts_units"); this.oParent.getElementById('res_o_ts_units').textContent = n1; } } if (this.isSelected("o_group_space")) { if (this.isSelected("o_add_space_after_punctuation")) { [sText, n1] = this.formatText(sText, "add_space_after_punctuation"); [sText, n2] = this.formatText(sText, "add_space_repair"); this.oParent.getElementById('res_o_add_space_after_punctuation').textContent = n1 - n2; } if (this.isSelected("o_add_space_around_hyphens")) { [sText, n1] = this.formatText(sText, "add_space_around_hyphens"); this.oParent.getElementById('res_o_add_space_around_hyphens').textContent = n1; } this.setOption("o_group_space", false); this.switchGroup("o_group_space"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 4; // suppression if (this.isSelected("o_group_delete")) { if (this.isSelected("o_erase_non_breaking_hyphens")) { [sText, n1] = this.formatText(sText, "erase_non_breaking_hyphens"); this.oParent.getElementById('res_o_erase_non_breaking_hyphens').textContent = n1; } this.setOption("o_group_delete", false); this.switchGroup("o_group_delete"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 5; // signes typographiques if (this.isSelected("o_group_typo")) { if (this.isSelected("o_ts_apostrophe")) { [sText, n1] = this.formatText(sText, "ts_apostrophe"); this.oParent.getElementById('res_o_ts_apostrophe').textContent = n1; } if (this.isSelected("o_ts_ellipsis")) { [sText, n1] = this.formatText(sText, "ts_ellipsis"); this.oParent.getElementById('res_o_ts_ellipsis').textContent = n1; } if (this.isSelected("o_ts_dash_start")) { if (this.isSelected("o_ts_m_dash_start")) { [sText, n1] = this.formatText(sText, "ts_m_dash_start"); } else { [sText, n1] = this.formatText(sText, "ts_n_dash_start"); } this.oParent.getElementById('res_o_ts_dash_start').textContent = n1; } if (this.isSelected("o_ts_dash_middle")) { if (this.isSelected("o_ts_m_dash_middle")) { [sText, n1] = this.formatText(sText, "ts_m_dash_middle"); } else { [sText, n1] = this.formatText(sText, "ts_n_dash_middle"); } this.oParent.getElementById('res_o_ts_dash_middle').textContent = n1; } if (this.isSelected("o_ts_quotation_marks")) { [sText, n1] = this.formatText(sText, "ts_quotation_marks"); this.oParent.getElementById('res_o_ts_quotation_marks').textContent = n1; } if (this.isSelected("o_ts_spell")) { [sText, n1] = this.formatText(sText, "ts_spell"); this.oParent.getElementById('res_o_ts_spell').textContent = n1; } if (this.isSelected("o_ts_ligature")) { // ligatures typographiques : fi, fl, ff, ffi, ffl, ft, st if (this.isSelected("o_ts_ligature_do")) { if (this.isSelected("o_ts_ligature_ffi")) { [sText, n1] = this.formatText(sText, "ts_ligature_ffi_do"); } |
︙ | ︙ | |||
460 461 462 463 464 465 466 | if (this.isSelected("o_ts_ligature_ft")) { [sText, n6] = this.formatText(sText, "ts_ligature_ft_undo"); } if (this.isSelected("o_ts_ligature_st")) { [sText, n7] = this.formatText(sText, "ts_ligature_st_undo"); } } | | | | | | | | | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | if (this.isSelected("o_ts_ligature_ft")) { [sText, n6] = this.formatText(sText, "ts_ligature_ft_undo"); } if (this.isSelected("o_ts_ligature_st")) { [sText, n7] = this.formatText(sText, "ts_ligature_st_undo"); } } this.oParent.getElementById('res_o_ts_ligature').textContent = n1 + n2 + n3 + n4 + n5 + n6 + n7; } this.setOption("o_group_typo", false); this.switchGroup("o_group_typo"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = 6; // divers if (this.isSelected("o_group_misc")) { if (this.isSelected("o_ordinals_no_exponant")) { if (this.isSelected("o_ordinals_exponant")) { [sText, n1] = this.formatText(sText, "ordinals_exponant"); } else { [sText, n1] = this.formatText(sText, "ordinals_no_exponant"); } this.oParent.getElementById('res_o_ordinals_no_exponant').textContent = n1; } if (this.isSelected("o_etc")) { [sText, n1] = this.formatText(sText, "etc"); this.oParent.getElementById('res_o_etc').textContent = n1; } if (this.isSelected("o_missing_hyphens")) { [sText, n1] = this.formatText(sText, "missing_hyphens"); this.oParent.getElementById('res_o_missing_hyphens').textContent = n1; } if (this.isSelected("o_ma_word")) { [sText, n1] = this.formatText(sText, "ma_word"); if (this.isSelected("o_ma_1letter_lowercase")) { [sText, n1] = this.formatText(sText, "ma_1letter_lowercase"); if (this.isSelected("o_ma_1letter_uppercase")) { [sText, n1] = this.formatText(sText, "ma_1letter_uppercase"); } } this.oParent.getElementById('res_o_ma_word').textContent = n1; } this.setOption("o_group_misc", false); this.switchGroup("o_group_misc"); } this.oParent.getElementById('grammalecte_tf_progressbar').value = this.oParent.getElementById('grammalecte_tf_progressbar').max; // end of processing //window.setCursor("auto"); // restore pointer const t1 = Date.now(); this.oParent.getElementById('grammalecte_tf_time_res').textContent = this.getTimeRes((t1-t0)/1000); this.xTextArea.value = sText; } catch (e) { showError(e); } } |
︙ | ︙ |
Modified gc_lang/fr/webext/manifest.json from [b647bed430] to [e5bad7cd5c].
︙ | ︙ | |||
112 113 114 115 116 117 118 119 120 121 122 123 124 125 | "default": "Ctrl+Shift+8" }, "description": "Ouvre l’éditeur lexical" } }, "web_accessible_resources": [ "grammalecte/_dictionaries/French.json", "grammalecte/fr/conj_data.json", "grammalecte/fr/mfsp_data.json", "grammalecte/fr/phonet_data.json", "grammalecte/fr/tests_data.json", "img/logo-16.png" ], | > > > > > | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | "default": "Ctrl+Shift+8" }, "description": "Ouvre l’éditeur lexical" } }, "web_accessible_resources": [ "content_scripts/panel.css", "content_scripts/panel_tf.css", "content_scripts/panel_gc.css", "content_scripts/panel_lxg.css", "content_scripts/menu.css", "grammalecte/_dictionaries/French.json", "grammalecte/fr/conj_data.json", "grammalecte/fr/mfsp_data.json", "grammalecte/fr/phonet_data.json", "grammalecte/fr/tests_data.json", "img/logo-16.png" ], |
︙ | ︙ |