Overview
Comment: | [fx] minor coding style adjustments |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | fx | comunicate |
Files: | files | file ages | folders |
SHA3-256: |
2d45cbf4988dcd100439cf881371ea7f |
User & Date: | olr on 2018-11-11 11:47:12 |
Other Links: | branch diff | manifest | tags |
Context
2018-11-12
| ||
12:22 | [fx] minor coding style adjustments check-in: 74f2ec49cc user: olr tags: fx, comunicate | |
2018-11-11
| ||
11:47 | [fx] minor coding style adjustments check-in: 2d45cbf498 user: olr tags: fx, comunicate | |
2018-11-10
| ||
14:23 | Fix some case check-in: 73aa037b8d user: IllusionPerdu tags: comunicate | |
Changes
Modified gc_lang/fr/webext/content_scripts/event.js from [d1ea962963] to [8bfc3ad28c].
︙ | ︙ | |||
39 40 41 42 43 44 45 | var eventGrammalecte = new CustomEvent("GrammalecteEvent", { detail: JSON.stringify(dataToSend) }); document.dispatchEvent(eventGrammalecte); return dataToSend.IdAction; } // ! Envoie de l'information que l'injection est bien faite ;) // (peut être lu aussi bien par la page web que le content script) | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | var eventGrammalecte = new CustomEvent("GrammalecteEvent", { detail: JSON.stringify(dataToSend) }); document.dispatchEvent(eventGrammalecte); return dataToSend.IdAction; } // ! Envoie de l'information que l'injection est bien faite ;) // (peut être lu aussi bien par la page web que le content script) var customAPILoaded = new CustomEvent("GLInjectedScriptIsReady"); document.dispatchEvent(customAPILoaded); // Gros Hack : Auto add a button in tinymce ;) // Page to test v4 https://www.quackit.com/html/html_editors/tinymce_editor.cfm // https://www.responsivefilemanager.com/demo.php |
︙ | ︙ | |||
112 113 114 115 116 117 118 | let iframeElement; if (typeof xEditorAdd.iframeElement !== "undefined" && typeof xEditorAdd.iframeElement.id !== "undefined") { iframeElement = xEditorAdd.iframeElement.id; } else if (typeof xEditorAdd.editorId !== "undefined") { iframeElement = xEditorAdd.editorId + "_ifr"; } | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | let iframeElement; if (typeof xEditorAdd.iframeElement !== "undefined" && typeof xEditorAdd.iframeElement.id !== "undefined") { iframeElement = xEditorAdd.iframeElement.id; } else if (typeof xEditorAdd.editorId !== "undefined") { iframeElement = xEditorAdd.editorId + "_ifr"; } sendToGrammalecte({ sTextToParse: sText, iframe: iframeElement }); } }); } function TinyInPage() { for (var i = tinyMCE.editors.length - 1; i > -1; i--) { let idTiny = tinyMCE.editors[i].id; |
︙ | ︙ | |||
147 148 149 150 151 152 153 | if (tinyMCE.majorVersion >= 4) { tinyMCE.on("AddEditor", TinyOnEditor); } else if (tinyMCE.majorVersion >= 3) { tinyMCE.onAddEditor.add(TinyOnEditor); } try { TinyInPage(); | | > > | | | | | | 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 | if (tinyMCE.majorVersion >= 4) { tinyMCE.on("AddEditor", TinyOnEditor); } else if (tinyMCE.majorVersion >= 3) { tinyMCE.onAddEditor.add(TinyOnEditor); } try { TinyInPage(); } catch (e) { console.error(e); } } /* // ! In the webpage script : document.addEventListener('GLInjectedScriptIsReady', function() { // Le gestionnaire d'évènement est prêt! // La page web peut effectuer des actions ... }); ... // Pour demander une correction sur le texte sendToGrammalecte({"sTextToParse": "salut comment ca vaa?"}); // Pour demander une correction sur un élément html sendToGrammalecte({"sTextToParse": true, "elm": elementHTML}); // Pour avoir le lexicographe sur un texte sendToGrammalecte({"sTextForLexicographer": "salut comment ca vaa?"}); // Pour avoir le lexicographe sur un élément html sendToGrammalecte({"sTextForLexicographer": true, "elm": elementHTML}); */ |
Modified gc_lang/fr/webext/content_scripts/init.js from [d32aff06fe] to [324ce24005].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | https://bugzilla.mozilla.org/show_bug.cgi?id=1267027 No SharedWorker, no images allowed for now… */ "use strict"; function showError(e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } // Chrome don’t follow the W3C specification: // https://browserext.github.io/browserext/ let bChrome = false; if (typeof browser !== "object") { | > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | https://bugzilla.mozilla.org/show_bug.cgi?id=1267027 No SharedWorker, no images allowed for now… */ "use strict"; function showError(e) { // because console can’t display error objects from content script console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } // Chrome don’t follow the W3C specification: // https://browserext.github.io/browserext/ let bChrome = false; if (typeof browser !== "object") { |
︙ | ︙ | |||
36 37 38 39 40 41 42 | img.src = (URL || webkitURL).createObjectURL(blobTxt); // webkitURL is obsolete: https://bugs.webkit.org/show_bug.cgi?id=167518 Array.filter(document.getElementsByClassName(sContainerClass), function (oElem) { oElem.appendChild(img); }); } */ | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | img.src = (URL || webkitURL).createObjectURL(blobTxt); // webkitURL is obsolete: https://bugs.webkit.org/show_bug.cgi?id=167518 Array.filter(document.getElementsByClassName(sContainerClass), function (oElem) { oElem.appendChild(img); }); } */ let oTinyAdd = {}; const oGrammalecte = { nMenu: 0, lMenu: [], oTFPanel: null, oLxgPanel: null, |
︙ | ︙ | |||
107 108 109 110 111 112 113 | When a textarea is added via jascript we add the menu :) */ function NodeTinyMCE(xNode) { let parentNode = xNode.parentNode; //mutation.target if ( typeof xNode !== "undefined" && typeof xNode.id !== "undefined" && | | | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | When a textarea is added via jascript we add the menu :) */ function NodeTinyMCE(xNode) { let parentNode = xNode.parentNode; //mutation.target if ( typeof xNode !== "undefined" && typeof xNode.id !== "undefined" && typeof oTinyAdd[xNode.id] === "undefined" && (parentNode.classList.contains("mce-edit-area") || parentNode.classList.contains("mceIframeContainer")) ) { //console.log(oTinyAdd, xNode, parentNode, parentNode.classList); oTinyAdd[xNode.id] = true; sendToWebpage({ tiny: xNode.id.replace("_ifr", "") }); } } this.xObserver = new MutationObserver(function(mutations) { mutations.forEach(function(mutation) { for (let i = 0; i < mutation.addedNodes.length; i++) { let MutationNode = mutation.addedNodes[i]; |
︙ | ︙ | |||
403 404 405 406 407 408 409 410 | oGrammalecte.rescanPage(); break; default: console.log("[Content script] Unknown command: " + sActionDone); } }); /* | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 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 | oGrammalecte.rescanPage(); break; default: console.log("[Content script] Unknown command: " + sActionDone); } }); /* Communicate webpage script <=> WebExtension La méthode d’injection de ce script est importante ! Pour que la page web puisse envoyer des infos au background Page web => Script injecté => Content script => Background Pour la réponse, ce sont les mêmes étapes en sens inverse. */ let xScriptNode = document.createElement("script"); xScriptNode.src = browser.extension.getURL("content_scripts/event.js"); document.documentElement.appendChild(xScriptNode); let nMin = Math.ceil(0); let nMax = Math.floor(9999999); function uniqueID() { return Date.now().toString(36) + "-" + (Math.floor(Math.random() * (nMax - nMin)) + nMin).toString(36); } // ! Écoute des messages venant du script injecté document.addEventListener("GrammalecteEvent", function(event) { let oActionFromPage = JSON.parse(event.detail); //console.log(event); let sText = false; let dInfo = {}; let xNodeToParse = null; if (oActionFromPage.iframe) { xNodeToParse = document.getElementById(oActionFromPage.iframe).contentWindow.document.body; } if (oActionFromPage.elm) { xNodeToParse = document.getElementById(oActionFromPage.elm); sText = xNodeToParse.tagName == "TEXTAREA" ? xNodeToParse.value : xNodeToParse.innerText; dInfo = { sTextAreaId: xNodeToParse.id }; } if (oActionFromPage.sTextToParse) { oGrammalecte.startGCPanel(xNodeToParse); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: { sText: sText || oActionFromPage.sTextToParse, sCountry: "FR", bDebug: false, bContext: false }, dInfo: dInfo }); } if (oActionFromPage.sTextForLexicographer) { oGrammalecte.startLxgPanel(); xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: { sText: sText || oActionFromPage.sTextForLexicographer }, dInfo: dInfo }); } }); let bInjectedScriptReady = false; let lBufferMsg = []; // ! Permet d’envoyer des messages vers le script injecté // (peut aussi être lu par un script sur la page web) function sendToWebpage (oDataAction) { let oDataToSend = oDataAction; if (typeof oDataToSend.IdAction === "undefined") { oDataToSend.IdAction = uniqueID(); } if (oDataAction.elm) { if (!oDataAction.elm.id) { oDataAction.elm.id = uniqueID(); } oDataToSend.elm = oDataAction.elm.id; } if (!bInjectedScriptReady) { lBufferMsg.push(oDataToSend); } else { //console.log('sendToWebpage', oDataToSend); let eventGrammalecte = new CustomEvent("GrammalecteToPage", { detail: JSON.stringify(oDataToSend) }); document.dispatchEvent(eventGrammalecte); } return oDataToSend.IdAction; } // ! Les messages ne peuvent être envoyés qu’après l’injection du script document.addEventListener("GLInjectedScriptIsReady", function () { //console.log("GLInjectedScriptIsReady EXT"); bInjectedScriptReady = true; if (lBufferMsg.length > 0) { for (const oDataToSend of lBufferMsg) { let eventGrammalecte = new CustomEvent("GrammalecteToPage", { detail: JSON.stringify(oDataToSend) }); document.dispatchEvent(eventGrammalecte); } } }); sendToWebpage({ init: browser.extension.getURL("") }); |