Overview
Comment: | Fix some case |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | comunicate |
Files: | files | file ages | folders |
SHA3-256: |
73aa037b8d414c00c7cb0017a285fb9e |
User & Date: | IllusionPerdu on 2018-11-10 14:23:07 |
Other Links: | branch diff | manifest | tags |
Context
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 | |
2018-11-08
| ||
17:51 | Fix for firefox check-in: 175e6bd8bf user: IllusionPerdu tags: comunicate | |
Changes
Modified gc_lang/fr/webext/content_scripts/event.js from [cef6680984] to [d1ea962963].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | let browserURL; document.addEventListener("GrammalecteToPage", function respListener(event) { //console.log(event); var data = JSON.parse(event.detail); // Message envoyer dès que le script est injecté if (typeof data.init !== "undefined") { browserURL = data.init; } //console.log("GrammalecteToPage",data); }); // ! Permet d'envoyer des message vers le content script // Retourne un identifiant unique au cas ou si besoin // La ID unique peut être util si on permet d'intérogé grammalecte sans zone | > > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | let browserURL; document.addEventListener("GrammalecteToPage", function respListener(event) { //console.log(event); var data = JSON.parse(event.detail); // Message envoyer dès que le script est injecté if (typeof data.init !== "undefined") { browserURL = data.init; } if (typeof data.tiny !== "undefined") { //console.log('Detect Tiny', data.tiny); TinyIDInPage(data.tiny); } //console.log("GrammalecteToPage",data); }); // ! Permet d'envoyer des message vers le content script // Retourne un identifiant unique au cas ou si besoin // La ID unique peut être util si on permet d'intérogé grammalecte sans zone |
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 | // ! 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("GrammalecteIsLoaded"); 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 // Page to test v3 http://www.imathas.com/editordemo/demo.html | > > > | < | | > | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | > > | > > > > > | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > | < | | < < < < < < < < < | 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 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 | // ! 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("GrammalecteIsLoaded"); 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 // Page to test v3 http://www.imathas.com/editordemo/demo.html function TinyOnEditor(event, editor = null) { let xEditorAdd = editor || event.editor; //console.log(xEditorAdd); if (typeof xEditorAdd.settings.Grammalecte === "undefined") { let aBtn; let plugSep; let bIsAdded = false; if (tinyMCE.majorVersion >= 4) { plugSep = " "; aBtn = ["toolbar3", "toolbar2", "toolbar1", "toolbar"]; } else if (tinyMCE.majorVersion >= 3) { plugSep = ","; aBtn = ["theme_advanced_buttons3", "theme_advanced_buttons2", "theme_advanced_buttons1", "theme_advanced_buttons1_add_before"]; } let eBtn; let iBtn = 0; let nBtn = aBtn.length; for (eBtn of aBtn) { if (!bIsAdded && (typeof xEditorAdd.settings[eBtn] !== "undefined" || iBtn == nBtn)) { bIsAdded = true; if (typeof xEditorAdd.settings[eBtn] !== "undefined" && xEditorAdd.settings[eBtn] !== "") { xEditorAdd.settings[eBtn] = (xEditorAdd.settings[eBtn] + plugSep + "Grammalecte").trim(); } else { let m = /(.*)([0-9])/.exec(eBtn); if (m.length === 3 && parseInt(m[2]) > 1 && xEditorAdd.settings[eBtn] === "") { eBtn = m[1] + (parseInt(m[2]) - 1); xEditorAdd.settings[eBtn] = (xEditorAdd.settings[eBtn] + plugSep + "Grammalecte").trim(); } else { xEditorAdd.settings[eBtn] = "Grammalecte"; } } } iBtn++; } if (!bIsAdded) { //Valeur par defaut xEditorAdd.settings[eBtn] = "undo redo | styleselect | bold italic | alignleft" + " aligncenter alignright alignjustify | " + " bullist numlist outdent indent | link image" + " Grammalecte"; } xEditorAdd.settings["Grammalecte"] = true; } xEditorAdd.addButton("Grammalecte", { text: "", icon: false, image: browserURL + "img/logo-16.png", //"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAC8UlEQVQ4jX3TbUgTcRwH8P89ddu5u9tt082aZmpFEU4tFz0QGTUwCi0heniR9MSUIKRaD0RvIlKigsooo+iNFa0XJYuwIjEK19OcDtPElsG0ktyp591t7u7+vUh7MPX3+vf5/n8/+P0BmKJIPUUVlh2rdVVeesWlzEybqg+bFOsoylnqPmNavGFfknV2Omu2Lvja3vxAURKJib3opHizu8riLK6gjRyuKgmoSoMRFENRUqfXTzvBGK62LC2uoFkOl4RhjQ8+qWt7dPNE3sbdp+2LXbsGe9qb4rIo/BfwFy6nWQ4ThWGNDzbcfu29dMDh2nHU7CypYNLmzTda0/L5cNuzmDQi/A4Y27k6eQxLI79wS/11D0AAMNvs6XT6ojVJjJEgTbMy2BT77xBMp09KcpaWV1uc41jQoi0NdUHfjeOO9WWn7AVF7s7n986SithPJGeupBh2PCSP/xxqxAp3eq6wuUV7Wc6MSZIEhA8vHjbfOe/OcW3zmAuKy+nUzAyD2bow8ODaEROFq8AyZ5WBYdEZXGqGxZ61HJV+9HYCJRbTNA0QBA40HWunaKN5dKg/DBKxeCIe09Th/m4MJwiMSZmLEzMQAABQRuNqgu8NYX3doTcMpvCkLbtQZ2AJkrPOZG1zlnY13T+Hy9EehY90h57eqcorcZ/lctZuMzAsOjLEqwNv66/6vZcPYRBC+C3cGaBxhSet2av1BpYgTTY7k5y2JPT41slIR6Axv8R9nnOs+4Pf+2r992uOxGVJwgAAAEINfgt3BGgsESWtWas1iGDyl+CT/u7WpvxNFRc4x7qtBoZFhSFejb7z1fq9NYfjsiT+cwcQavBruCOgU4SIGo18amuoq3Js3FNlynVtH385+s53ze+t8cRkURx3yMTTRBAEQVAUXbFlf3XystJKA2NExeFBdWASDAAA+MQACCEEmqbJ0b6PMC7JwhDU8YFHV5u9NZ64LErT/oW/63tPV6uJwmKoOND78u7Fg5NhAAD4CVbzY9cwrWQrAAAAAElFTkSuQmCC", onclick: function(e) { //console.log( xEditorAdd.getContent() ); //console.log( xEditorAdd.getBody().innerText ) let sText = xEditorAdd.getBody().innerText; 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({ spellcheck: sText, iframe: iframeElement }); } }); } function TinyInPage() { for (var i = tinyMCE.editors.length - 1; i > -1; i--) { let idTiny = tinyMCE.editors[i].id; if (typeof tinyMCE.editors[i].settings.Grammalecte === "undefined") { TinyIDInPage(idTiny); } } } function TinyIDInPage(idTiny) { if (tinyMCE.majorVersion >= 4) { tinyMCE.EditorManager.execCommand("mceFocus", true, idTiny); tinyMCE.EditorManager.execCommand("mceRemoveEditor", true, idTiny); tinyMCE.EditorManager.execCommand("mceAddEditor", false, idTiny); } else if (tinyMCE.majorVersion >= 3) { tinyMCE.execCommand("mceFocus", false, idTiny); tinyMCE.execCommand("mceRemoveControl", true, idTiny); tinyMCE.execCommand("mceAddControl", false, idTiny); } } if (typeof tinyMCE !== "undefined" && tinyMCE.majorVersion && tinyMCE.majorVersion >= 3 && tinyMCE.majorVersion <= 5) { //console.log("Have TinyMCE"); if (tinyMCE.majorVersion >= 4) { tinyMCE.on("AddEditor", TinyOnEditor); } else if (tinyMCE.majorVersion >= 3) { tinyMCE.onAddEditor.add(TinyOnEditor); } try { TinyInPage(); } catch (error) {} } /* // ! In the webpage script : document.addEventListener('GrammalecteIsLoaded', function() { // Le gestionnaire d'évènement est prêt! // La page web peut effectuer des actions ... |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/init.js from [16c99e6a6e] to [d32aff06fe].
︙ | ︙ | |||
9 10 11 12 13 14 15 | 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… */ "use strict"; | < | | < > < | | > > | | > > | | | | > > > > > > > > > > > > > | | | > > > | | > > > > > | | > > > > > > > > > > > > > > > | | > > | > > | > > | | > | > > | > | | | | | | | | | < | | | < | < | | | | 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 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 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 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 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 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 | 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… */ "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") { var browser = chrome; bChrome = true; } /* function loadImage (sContainerClass, sImagePath) { let xRequest = new XMLHttpRequest(); xRequest.open('GET', browser.extension.getURL("")+sImagePath, false); xRequest.responseType = "arraybuffer"; xRequest.send(); let blobTxt = new Blob([xRequest.response], {type: 'image/png'}); let img = document.createElement('img'); 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); }); } */ var tinyAdd = {}; const oGrammalecte = { nMenu: 0, lMenu: [], oTFPanel: null, oLxgPanel: null, 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 ); }, clearRightClickedNode: function() { this.xRightClickedNode = null; }, createMenus: function() { if (bChrome) { browser.storage.local.get("ui_options", this._createMenus.bind(this)); return; } browser.storage.local.get("ui_options").then(this._createMenus.bind(this), showError); }, _createMenus: function(dOptions) { if (dOptions.hasOwnProperty("ui_options")) { dOptions = dOptions.ui_options; if (dOptions.textarea) { for (let xNode of document.getElementsByTagName("textarea")) { if (xNode.style.display !== "none" && xNode.style.visibility !== "hidden" && xNode.getAttribute("spellcheck") !== "false") { this.lMenu.push(new GrammalecteMenu(this.nMenu, xNode)); this.nMenu += 1; } } } if (dOptions.editablenode) { for (let xNode of document.querySelectorAll("[contenteditable]")) { this.lMenu.push(new GrammalecteMenu(this.nMenu, xNode)); this.nMenu += 1; } } } }, observePage: function() { /* 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 tinyAdd[xNode.id] === "undefined" && (parentNode.classList.contains("mce-edit-area") || parentNode.classList.contains("mceIframeContainer")) ) { //console.log(tinyAdd, xNode, parentNode, parentNode.classList); tinyAdd[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]; let tagName = MutationNode.tagName; if (tagName == "TEXTAREA") { oGrammalecte.lMenu.push(new GrammalecteMenu(oGrammalecte.nMenu, MutationNode)); oGrammalecte.nMenu += 1; } else if (tagName == "IFRAME") { NodeTinyMCE(MutationNode); } else if ((tagName == "DIV" || tagName == "SPAN") && MutationNode.hasAttribute && MutationNode.hasAttribute("contenteditable")) { oGrammalecte.lMenu.push(new GrammalecteMenu(oGrammalecte.nMenu, MutationNode)); oGrammalecte.nMenu += 1; } else if (MutationNode.getElementsByTagName) { for (let xNode of MutationNode.getElementsByTagName("textarea")) { oGrammalecte.lMenu.push(new GrammalecteMenu(oGrammalecte.nMenu, xNode)); oGrammalecte.nMenu += 1; } for (let xNode of MutationNode.getElementsByTagName("div")) { if (xNode.hasAttribute && xNode.hasAttribute("contenteditable")){ oGrammalecte.lMenu.push(new GrammalecteMenu(oGrammalecte.nMenu, xNode)); oGrammalecte.nMenu += 1; } } for (let xNode of MutationNode.getElementsByTagName("span")) { if (xNode.hasAttribute && xNode.hasAttribute("contenteditable")){ oGrammalecte.lMenu.push(new GrammalecteMenu(oGrammalecte.nMenu, xNode)); oGrammalecte.nMenu += 1; } } for (let xNode of MutationNode.getElementsByTagName("iframe")) { NodeTinyMCE(xNode); } } } }); }); this.xObserver.observe(document.body, { childList: true, subtree: true }); }, rescanPage: function() { if (this.oTFPanel !== null) { this.oTFPanel.hide(); } if (this.oLxgPanel !== null) { this.oLxgPanel.hide(); } if (this.oGCPanel !== null) { this.oGCPanel.hide(); } for (let oMenu of this.lMenu) { oMenu.deleteNodes(); } this.lMenu.length = 0; // to clear an array this.listenRightClick(); this.createMenus(); }, createTFPanel: function() { if (this.oTFPanel === null) { this.oTFPanel = new GrammalecteTextFormatter("grammalecte_tf_panel", "Formateur de texte", 760, 615, false); //this.oTFPanel.logInnerHTML(); this.oTFPanel.insertIntoPage(); window.setTimeout( function(self) { self.oTFPanel.adjustHeight(); }, 50, this ); } }, createLxgPanel: function() { if (this.oLxgPanel === null) { this.oLxgPanel = new GrammalecteLexicographer("grammalecte_lxg_panel", "Lexicographe", 500, 700); this.oLxgPanel.insertIntoPage(); } }, createGCPanel: function() { if (this.oGCPanel === null) { this.oGCPanel = new GrammalecteGrammarChecker("grammalecte_gc_panel", "Grammalecte", 500, 700); this.oGCPanel.insertIntoPage(); } }, createMessageBox: function() { if (this.oMessageBox === null) { this.oMessageBox = new GrammalecteMessageBox("grammalecte_message_box", "Grammalecte"); this.oMessageBox.insertIntoPage(); } }, startGCPanel: function(xNode = null) { this.createGCPanel(); this.oGCPanel.clear(); this.oGCPanel.show(); this.oGCPanel.start(xNode); this.oGCPanel.startWaitIcon(); }, startLxgPanel: function() { this.createLxgPanel(); this.oLxgPanel.clear(); this.oLxgPanel.show(); this.oLxgPanel.startWaitIcon(); }, startFTPanel: function(xNode = null) { this.createTFPanel(); this.oTFPanel.start(xNode); this.oTFPanel.show(); }, 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); } return sPageText; }, createNode: function(sType, oAttr, oDataset = null) { try { let xNode = document.createElement(sType); Object.assign(xNode, oAttr); if (oDataset) { Object.assign(xNode.dataset, oDataset); } return xNode; } catch (e) { showError(e); } }, createStyle: function(sLinkCss, sLinkId = null, xNodeToAppendTo = null) { try { let xNode = document.createElement("link"); Object.assign(xNode, { rel: "stylesheet", type: "text/css", media: "all", href: this.sExtensionUrl + sLinkCss }); if (sLinkId) { Object.assign(xNode, { id: sLinkId }); } if (xNodeToAppendTo) { xNodeToAppendTo.appendChild(xNode); } 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; // Start oGrammalecte.listenRightClick(); oGrammalecte.createMenus(); |
︙ | ︙ | |||
283 284 285 286 287 288 289 | Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "rightClickGCEditableNode": if (oGrammalecte.xRightClickedNode !== null) { oGrammalecte.startGCPanel(oGrammalecte.xRightClickedNode); | | | | > | > | | | | > | > | > | > | 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 | Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "rightClickGCEditableNode": if (oGrammalecte.xRightClickedNode !== null) { oGrammalecte.startGCPanel(oGrammalecte.xRightClickedNode); sText = oGrammalecte.xRightClickedNode.tagName == "TEXTAREA" ? oGrammalecte.xRightClickedNode.value : oGrammalecte.xRightClickedNode.innerText; xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, dInfo: { sTextAreaId: oGrammalecte.xRightClickedNode.id } }); } 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 "rightClickGCPage": oGrammalecte.startGCPanel(); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: { sText: oGrammalecte.getPageText(), sCountry: "FR", bDebug: false, bContext: false }, dInfo: {} }); break; case "rightClickGCSelectedText": oGrammalecte.startGCPanel(); // selected text is sent to the GC worker in the background script. break; // Lexicographer commands case "rightClickLxgEditableNode": if (oGrammalecte.xRightClickedNode !== null) { oGrammalecte.startLxgPanel(); sText = oGrammalecte.xRightClickedNode.tagName == "TEXTAREA" ? oGrammalecte.xRightClickedNode.value : oGrammalecte.xRightClickedNode.innerText; xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: { sText: sText }, dInfo: { sTextAreaId: oGrammalecte.xRightClickedNode.id } }); } else { oGrammalecte.showMessage( "Erreur. Le node sur lequel vous avez cliqué n’a pas pu être identifié. Sélectionnez le texte à analyser et relancez le lexicographe via le menu contextuel." ); } break; case "rightClickLxgPage": oGrammalecte.startLxgPanel(); xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: { sText: oGrammalecte.getPageText() }, dInfo: {} }); break; case "rightClickLxgSelectedText": oGrammalecte.startLxgPanel(); // selected text is sent to the GC worker in the background script. break; // Text formatter command case "rightClickTFEditableNode": if (oGrammalecte.xRightClickedNode !== null) { if (oGrammalecte.xRightClickedNode.tagName == "TEXTAREA") { oGrammalecte.startFTPanel(oGrammalecte.xRightClickedNode); } else { oGrammalecte.showMessage( "Cette zone de texte n’est pas réellement un champ de formulaire, mais un node HTML éditable. Le formateur de texte n’est pas disponible pour ce type de champ de saisie." ); } } else { oGrammalecte.showMessage("Erreur. Le node sur lequel vous avez cliqué n’a pas pu être identifié."); } break; // rescan page command case "rescanPage": |
︙ | ︙ |