Comment: | [fx][tb] code clarification |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | tb | fx |
Files: | files | file ages | folders |
SHA3-256: |
58ba816fa35e6a2fb36235dd3fc0f1cd |
User & Date: | olr on 2020-03-18 14:04:15 |
Other Links: | manifest | tags |
2020-03-18
| ||
17:36 | [fx] update observePage() check-in: 99326d3d4b user: olr tags: trunk, fx | |
14:04 | [fx][tb] code clarification check-in: 58ba816fa3 user: olr tags: trunk, tb, fx | |
13:29 | [doc] Web API update check-in: 1cefc9c400 user: olr tags: trunk, doc | |
Modified gc_lang/fr/mailext/background.js from [3a88cd4eaf] to [84cc5ca0a0].
︙ | ︙ | |||
14 15 16 17 18 19 20 | start: function () { this.xGCEWorker = new Worker("gce_worker.js"); this.xGCEWorker.onmessage = function (e) { // Messages received from the Worker // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { this.nLastTimeWorkerResponse = Date.now(); | | | | | | 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 | start: function () { this.xGCEWorker = new Worker("gce_worker.js"); this.xGCEWorker.onmessage = function (e) { // Messages received from the Worker // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { this.nLastTimeWorkerResponse = Date.now(); let {sActionDone, result, oInfo, bEnd, bError} = e.data; if (bError) { console.log(result); console.log(oInfo); return; } switch (sActionDone) { case "init": storeGCOptions(result); break; case "parse": case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": // send result to content script if (typeof(oInfo.iReturnPort) === "number") { let xPort = dConnx.get(oInfo.iReturnPort); xPort.postMessage(e.data); } else { console.log("[background] don’t know where to send results"); console.log(e.data); } break; case "textToTest": |
︙ | ︙ | |||
137 138 139 140 141 142 143 | let dOptions = (oSavedOptions.hasOwnProperty("gc_options")) ? oSavedOptions.gc_options : null; if (dOptions !== null && Object.getOwnPropertyNames(dOptions).length == 0) { console.log("# Error: the saved options was an empty object."); dOptions = null; } oWorkerHandler.xGCEWorker.postMessage({ sCommand: "init", | | | | | | | | | | 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 | let dOptions = (oSavedOptions.hasOwnProperty("gc_options")) ? oSavedOptions.gc_options : null; if (dOptions !== null && Object.getOwnPropertyNames(dOptions).length == 0) { console.log("# Error: the saved options was an empty object."); dOptions = null; } oWorkerHandler.xGCEWorker.postMessage({ sCommand: "init", oParam: {sExtensionPath: browser.extension.getURL(""), dOptions: dOptions, sContext: "Firefox"}, oInfo: {} }); } catch (e) { console.log("initGrammarChecker failed"); showError(e); } }, _setSpellingDictionaries: function (oData) { if (oData.hasOwnProperty("community_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "community", oDict: oData["community_dictionary"] }, oInfo: {} }); } if (oData.hasOwnProperty("personal_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "personal", oDict: oData["personal_dictionary"] }, oInfo: {} }); } }, _initSCOptions: function (oData) { if (!oData.hasOwnProperty("sc_options")) { browser.storage.local.set({"sc_options": { community: true, personal: true }}); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "community", bActivate: true }, oInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "personal", bActivate: true }, oInfo: {} }); } else { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "community", bActivate: oData.sc_options["community"] }, oInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "personal", bActivate: oData.sc_options["personal"] }, oInfo: {} }); } } } // start the Worker for the GC oWorkerHandler.start(); |
︙ | ︙ |
Modified gc_lang/fr/mailext/content/lex_editor.js from [1f70f3f40f] to [e12409ccd5].
︙ | ︙ | |||
472 473 474 475 476 477 478 | let lEntry = oLexiconTable.getEntries(); if (lEntry.length > 0) { let oDAWG = new DAWG(lEntry, "S", "fr", "Français", "fr.personal", "Dictionnaire personnel", xProgressNode); let oJSON = oDAWG.createBinaryJSON(1); oFileHandler.saveFile("fr.personal.json", JSON.stringify(oJSON)); this.oIBDAWG = new IBDAWG(oJSON); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); | | | 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 | let lEntry = oLexiconTable.getEntries(); if (lEntry.length > 0) { let oDAWG = new DAWG(lEntry, "S", "fr", "Français", "fr.personal", "Dictionnaire personnel", xProgressNode); let oJSON = oDAWG.createBinaryJSON(1); oFileHandler.saveFile("fr.personal.json", JSON.stringify(oJSON)); this.oIBDAWG = new IBDAWG(oJSON); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); //browser.runtime.sendMessage({ sCommand: "setDictionary", oParam: {sType: "personal", oDict: oJSON}, oInfo: {} }); enableElement("export_button"); } else { oFileHandler.deleteFile("fr.personal.json"); this.setDictData(0, "[néant]"); disableElement("export_button"); } }, |
︙ | ︙ |
Modified gc_lang/fr/mailext/gce_worker.js from [3191c72f90] to [946a66a85a].
︙ | ︙ | |||
54 55 56 57 58 59 60 | Warning. Initialization can’t be completed at startup of the worker, for we need the path of the extension to load data stored in JSON files. This path is retrieved in background.js and passed with the event “init”. */ | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | Warning. Initialization can’t be completed at startup of the worker, for we need the path of the extension to load data stored in JSON files. This path is retrieved in background.js and passed with the event “init”. */ function createResponse (sActionDone, result, oInfo, bEnd, bError=false) { return { "sActionDone": sActionDone, "result": result, // can be of any type "oInfo": oInfo, "bEnd": bEnd, "bError": bError }; } function createErrorResult (e, sDescr="no description") { return { |
︙ | ︙ | |||
85 86 87 88 89 90 91 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ onmessage = function (e) { | | | | | | | | | | | | | | | | | | | | 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 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ onmessage = function (e) { let {sCommand, oParam, oInfo} = e.data; switch (sCommand) { case "init": init(oParam.sExtensionPath, oParam.dOptions, oParam.sContext, oInfo); break; case "parse": parse(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseAndSpellcheck": parseAndSpellcheck(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseAndSpellcheck1": parseAndSpellcheck1(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseFull": parseFull(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "getListOfTokens": getListOfTokens(oParam.sText, oInfo); break; case "getOptions": getOptions(oInfo); break; case "getDefaultOptions": getDefaultOptions(oInfo); break; case "setOptions": setOptions(oParam.sOptions, oInfo); break; case "setOption": setOption(oParam.sOptName, oParam.bValue, oInfo); break; case "resetOptions": resetOptions(oInfo); break; case "textToTest": textToTest(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "fullTests": fullTests(oInfo); break; case "setDictionary": setDictionary(oParam.sDictionary, oParam.oDict, oInfo); break; case "setDictionaryOnOff": setDictionaryOnOff(oParam.sDictionary, oParam.bActivate, oInfo); break; case "getSpellSuggestions": getSpellSuggestions(oParam.sWord, oInfo); break; case "getVerb": getVerb(oParam.sVerb, oParam.bPro, oParam.bNeg, oParam.bTpsCo, oParam.bInt, oParam.bFem, oInfo); break; default: console.log("[Worker] Unknown command: " + sCommand); showData(e.data); } } |
︙ | ︙ | |||
164 165 166 167 168 169 170 | This worker don’t work as a PromiseWorker (which returns a promise), so when we send request to this worker, we can’t wait the return of the answer just after the request made. The answer is received by the background in another function (onmessage). That’s why the full text to analyze is send in one block, but analyse is returned paragraph by paragraph. */ | | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | This worker don’t work as a PromiseWorker (which returns a promise), so when we send request to this worker, we can’t wait the return of the answer just after the request made. The answer is received by the background in another function (onmessage). That’s why the full text to analyze is send in one block, but analyse is returned paragraph by paragraph. */ function init (sExtensionPath, dOptions=null, sContext="JavaScript", oInfo={}) { try { if (!bInitDone) { console.log("[Worker] Loading… Extension path: " + sExtensionPath); conj.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/conj_data.json")); phonet.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/phonet_data.json")); mfsp.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/mfsp_data.json")); //console.log("[Worker] Modules have been initialized…"); |
︙ | ︙ | |||
191 192 193 194 195 196 197 | //tests(); bInitDone = true; } else { console.log("[Worker] Already initialized…") } // we always retrieve options from the gc_engine, for setOptions filters obsolete options dOptions = helpers.mapToObject(gc_engine.getOptions()); | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | //tests(); bInitDone = true; } else { console.log("[Worker] Already initialized…") } // we always retrieve options from the gc_engine, for setOptions filters obsolete options dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("init", dOptions, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("init", createErrorResult(e, "init failed"), oInfo, true, true)); } } function parse (sText, sCountry, bDebug, bContext, oInfo={}) { sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, bContext); postMessage(createResponse("parse", aGrammErr, oInfo, false)); } postMessage(createResponse("parse", null, oInfo, true)); } function parseAndSpellcheck (sText, sCountry, bDebug, bContext, oInfo={}) { let i = 0; sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck", {sParagraph: sParagraph, iParaNum: i, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, false)); i += 1; } postMessage(createResponse("parseAndSpellcheck", null, oInfo, true)); } function parseAndSpellcheck1 (sParagraph, sCountry, bDebug, bContext, oInfo={}) { sParagraph = sParagraph.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck1", {sParagraph: sParagraph, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, true)); } function parseFull (sText, sCountry, bDebug, bContext, oInfo={}) { let i = 0; sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let lSentence = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext, true); console.log("*", lSentence); postMessage(createResponse("parseFull", {sParagraph: sParagraph, iParaNum: i, lSentence: lSentence}, oInfo, false)); i += 1; } postMessage(createResponse("parseFull", null, oInfo, true)); } function getListOfTokens (sText, oInfo={}) { // lexicographer try { sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { if (sParagraph.trim() !== "") { postMessage(createResponse("getListOfTokens", oLxg.getListOfTokensReduc(sParagraph, true), oInfo, false)); } } postMessage(createResponse("getListOfTokens", null, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("getListOfTokens", createErrorResult(e, "no tokens"), oInfo, true, true)); } } function getOptions (oInfo={}) { let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("getOptions", dOptions, oInfo, true)); } function getDefaultOptions (oInfo={}) { let dOptions = helpers.mapToObject(gc_engine.getDefaultOptions()); postMessage(createResponse("getDefaultOptions", dOptions, oInfo, true)); } function setOptions (dOptions, oInfo={}) { if (!(dOptions instanceof Map)) { dOptions = helpers.objectToMap(dOptions); } gc_engine.setOptions(dOptions); dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("setOptions", dOptions, oInfo, true)); } function setOption (sOptName, bValue, oInfo={}) { console.log(sOptName+": "+bValue); if (sOptName) { gc_engine.setOption(sOptName, bValue); let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("setOption", dOptions, oInfo, true)); } } function resetOptions (oInfo={}) { gc_engine.resetOptions(); let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("resetOptions", dOptions, oInfo, true)); } function tests () { console.log(conj.getConj("devenir", ":E", ":2s")); console.log(mfsp.getMasForm("emmerdeuse", true)); console.log(mfsp.getMasForm("pointilleuse", false)); console.log(phonet.getSimil("est")); let aRes = gc_engine.parse("Je suit..."); for (let oErr of aRes) { console.log(text.getReadableError(oErr)); } } function textToTest (sText, sCountry, bDebug, bContext, oInfo={}) { if (!gc_engine) { postMessage(createResponse("textToTest", "# Grammar checker not loaded.", oInfo, true)); return; } sText = sText.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext); let sMsg = ""; for (let oErr of aGrammErr) { sMsg += text.getReadableError(oErr) + "\n"; } if (sMsg == "") { sMsg = "Aucune erreur détectée."; } postMessage(createResponse("textToTest", sMsg, oInfo, true)); } function fullTests (oInfo={}) { if (!gc_engine) { postMessage(createResponse("fullTests", "# Grammar checker not loaded.", oInfo, true)); return; } let dMemoOptions = gc_engine.getOptions(); let dTestOptions = gc_engine.getDefaultOptions(); dTestOptions.set("nbsp", true); dTestOptions.set("esp", true); dTestOptions.set("unit", true); dTestOptions.set("num", true); gc_engine.setOptions(dTestOptions); let sMsg = ""; for (let sRes of oTest.testParse()) { sMsg += sRes + "\n"; console.log(sRes); } gc_engine.setOptions(dMemoOptions); postMessage(createResponse("fullTests", sMsg, oInfo, true)); } // SpellChecker function setDictionary (sDictionary, oDict, oInfo) { if (!oSpellChecker) { postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", oInfo, true)); return; } //console.log("setDictionary", sDictionary); switch (sDictionary) { case "main": oSpellChecker.setMainDictionary(oDict, oInfo["sExtPath"]+"/grammalecte/graphspell/_dictionaries"); break; case "community": oSpellChecker.setCommunityDictionary(oDict); break; case "personal": oSpellChecker.setPersonalDictionary(oDict); break; default: console.log("[worker] setDictionary: Unknown dictionary <"+sDictionary+">"); } postMessage(createResponse("setDictionary", true, oInfo, true)); } function setDictionaryOnOff (sDictionary, bActivate, oInfo) { if (!oSpellChecker) { postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", oInfo, true)); return; } //console.log("setDictionaryOnOff", sDictionary, bActivate); switch (sDictionary) { case "community": if (bActivate) { oSpellChecker.activateCommunityDictionary(); |
︙ | ︙ | |||
389 390 391 392 393 394 395 | } else { oSpellChecker.deactivatePersonalDictionary(); } break; default: console.log("[worker] setDictionaryOnOff: Unknown dictionary <"+sDictionary+">"); } | | | | | | | | | 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 | } else { oSpellChecker.deactivatePersonalDictionary(); } break; default: console.log("[worker] setDictionaryOnOff: Unknown dictionary <"+sDictionary+">"); } postMessage(createResponse("setDictionaryOnOff", true, oInfo, true)); } function getSpellSuggestions (sWord, oInfo) { if (!oSpellChecker) { postMessage(createResponse("getSpellSuggestions", "# Error. SpellChecker not loaded.", oInfo, true)); return; } let i = 0; for (let aSugg of oSpellChecker.suggest(sWord)) { postMessage(createResponse("getSpellSuggestions", {sWord: sWord, aSugg: aSugg, iSuggBlock: i}, oInfo, true)); i += 1; } } // Conjugueur function getVerb (sWord, bPro, bNeg, bTpsCo, bInt, bFem, oInfo) { try { let oVerb = null; let oConjTable = null; if (conj.isVerb(sWord)) { oVerb = new Verb(sWord); oConjTable = oVerb.createConjTable(bPro, bNeg, bTpsCo, bInt, bFem); } postMessage(createResponse("getVerb", { oVerb: oVerb, oConjTable: oConjTable }, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("getVerb", createErrorResult(e, "no verb"), oInfo, true, true)); } } |
Modified gc_lang/fr/tb/content/lex_editor.js from [52568b3e47] to [7c96d2821d].
︙ | ︙ | |||
479 480 481 482 483 484 485 | let lEntry = oLexiconTable.getEntries(); if (lEntry.length > 0) { let oDAWG = new DAWG(lEntry, "S", "fr", "Français", "fr.personal", "Dictionnaire personnel", xProgressNode); let oJSON = oDAWG.createBinaryJSON(1); oFileHandler.saveFile("fr.personal.json", JSON.stringify(oJSON)); this.oIBDAWG = new IBDAWG(oJSON); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); | | | 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | let lEntry = oLexiconTable.getEntries(); if (lEntry.length > 0) { let oDAWG = new DAWG(lEntry, "S", "fr", "Français", "fr.personal", "Dictionnaire personnel", xProgressNode); let oJSON = oDAWG.createBinaryJSON(1); oFileHandler.saveFile("fr.personal.json", JSON.stringify(oJSON)); this.oIBDAWG = new IBDAWG(oJSON); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); //browser.runtime.sendMessage({ sCommand: "setDictionary", oParam: {sType: "personal", oDict: oJSON}, oInfo: {} }); enableElement("export_button"); } else { oFileHandler.deleteFile("fr.personal.json"); this.setDictData(0, "[néant]"); disableElement("export_button"); } }, |
︙ | ︙ |
Modified gc_lang/fr/webext/background.js from [3d2146a610] to [cc1bfe6b79].
︙ | ︙ | |||
26 27 28 29 30 31 32 | start: function () { this.xGCEWorker = new Worker("gce_worker.js"); this.xGCEWorker.onmessage = function (e) { // Messages received from the Worker // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { this.nLastTimeWorkerResponse = Date.now(); | | | | | | 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 | start: function () { this.xGCEWorker = new Worker("gce_worker.js"); this.xGCEWorker.onmessage = function (e) { // Messages received from the Worker // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { this.nLastTimeWorkerResponse = Date.now(); let {sActionDone, result, oInfo, bEnd, bError} = e.data; if (bError) { console.log(result); console.log(oInfo); return; } switch (sActionDone) { case "init": storeGCOptions(result); break; case "parse": case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": // send result to content script if (typeof(oInfo.iReturnPort) === "number") { let xPort = dConnx.get(oInfo.iReturnPort); xPort.postMessage(e.data); } else { console.log("[background] don’t know where to send results"); console.log(e.data); } break; case "textToTest": |
︙ | ︙ | |||
165 166 167 168 169 170 171 | let dOptions = (oSavedOptions.hasOwnProperty("gc_options")) ? oSavedOptions.gc_options : null; if (dOptions !== null && Object.getOwnPropertyNames(dOptions).length == 0) { console.log("# Error: the saved options was an empty object."); dOptions = null; } oWorkerHandler.xGCEWorker.postMessage({ sCommand: "init", | | | | | | | | | | | | 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 | let dOptions = (oSavedOptions.hasOwnProperty("gc_options")) ? oSavedOptions.gc_options : null; if (dOptions !== null && Object.getOwnPropertyNames(dOptions).length == 0) { console.log("# Error: the saved options was an empty object."); dOptions = null; } oWorkerHandler.xGCEWorker.postMessage({ sCommand: "init", oParam: {sExtensionPath: browser.extension.getURL(""), dOptions: dOptions, sContext: "Firefox"}, oInfo: {} }); } catch (e) { console.log("initGrammarChecker failed"); showError(e); } }, _setSpellingDictionaries: function (oData) { if (oData.hasOwnProperty("oPersonalDictionary")) { // deprecated (to be removed in 2020) console.log("personal dictionary migration"); browser.storage.local.set({ "personal_dictionary": oData["oPersonalDictionary"] }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "personal", oDict: oData["oPersonalDictionary"] }, oInfo: {} }); browser.storage.local.remove("oPersonalDictionary"); } if (oData.hasOwnProperty("main_dic_name")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "main", oDict: oData["main_dic_name"] }, oInfo: {sExtPath: browser.extension.getURL("")} }); } if (oData.hasOwnProperty("community_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "community", oDict: oData["community_dictionary"] }, oInfo: {} }); } if (oData.hasOwnProperty("personal_dictionary")) { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionary", oParam: { sDictionary: "personal", oDict: oData["personal_dictionary"] }, oInfo: {} }); } }, _initSCOptions: function (oData) { if (!oData.hasOwnProperty("sc_options")) { browser.storage.local.set({"sc_options": { community: true, personal: true }}); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "community", bActivate: true }, oInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "personal", bActivate: true }, oInfo: {} }); } else { oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "community", bActivate: oData.sc_options["community"] }, oInfo: {} }); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", oParam: { sDictionary: "personal", bActivate: oData.sc_options["personal"] }, oInfo: {} }); } } } // start the Worker for the GC oWorkerHandler.start(); |
︙ | ︙ | |||
242 243 244 245 246 247 248 | /* Messages from the extension (not the Worker) */ function handleMessage (oRequest, xSender, sendResponse) { // message from panels //console.log(xSender); | | | | | | | | | | 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 | /* Messages from the extension (not the Worker) */ function handleMessage (oRequest, xSender, sendResponse) { // message from panels //console.log(xSender); let {sCommand, oParam, oInfo} = oRequest; switch (sCommand) { case "getOptions": case "getDefaultOptions": case "setOptions": case "setOption": case "resetOptions": case "textToTest": case "fullTests": case "setDictionary": case "setDictionaryOnOff": oWorkerHandler.xGCEWorker.postMessage(oRequest); break; case "restartWorker": oWorkerHandler.restart(oParam["nDelayLimit"]); break; case "openURL": browser.tabs.create({url: oParam.sURL}); break; case "openConjugueurTab": openConjugueurTab(); break; case "openLexiconEditor": openLexiconEditor(oParam["dictionary"]); break; case "openDictionaries": openDictionaries(); break; default: console.log("[background] Unknown command: " + sCommand); console.log(oRequest); } //sendResponse({response: "response from background script"}); } browser.runtime.onMessage.addListener(handleMessage); function handleConnexion (xPort) { // Messages from tabs let iPortId = xPort.sender.tab.id; // identifier for the port: each port can be found at dConnx[iPortId] dConnx.set(iPortId, xPort); xPort.onMessage.addListener(function (oRequest) { let {sCommand, oParam, oInfo} = oRequest; switch (sCommand) { case "parse": case "parseAndSpellcheck": case "parseAndSpellcheck1": case "parseFull": case "getListOfTokens": case "getSpellSuggestions": case "getVerb": oRequest.oInfo.iReturnPort = iPortId; // we pass the id of the return port to receive answer oWorkerHandler.xGCEWorker.postMessage(oRequest); break; case "restartWorker": oWorkerHandler.restart(oParam["nDelayLimit"]); break; case "openURL": browser.tabs.create({url: oParam.sURL}); break; case "openConjugueurTab": openConjugueurTab(); break; case "openConjugueurWindow": openConjugueurWindow(); break; |
︙ | ︙ | |||
360 361 362 363 364 365 366 | case "grammar_checker_iframe": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.frameId); break; case "grammar_checker_selection": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.selectionText); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "parseAndSpellcheck", | | | | 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 | case "grammar_checker_iframe": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.frameId); break; case "grammar_checker_selection": sendCommandToTab(xTab.id, xInfo.menuItemId, xInfo.selectionText); oWorkerHandler.xGCEWorker.postMessage({ sCommand: "parseAndSpellcheck", oParam: {sText: xInfo.selectionText, sCountry: "FR", bDebug: false, bContext: false}, oInfo: {iReturnPort: xTab.id} }); break; // tools case "conjugueur_window": openConjugueurWindow(); break; case "conjugueur_tab": |
︙ | ︙ | |||
440 441 442 443 444 445 446 | dOptions = helpers.mapToObject(dOptions); } browser.storage.local.set({"gc_options": dOptions}); } function sendCommandToTab (iTab, sCommand, result=null) { let xTabPort = dConnx.get(iTab); | | | 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | 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, oInfo: 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); |
︙ | ︙ | |||
463 464 465 466 467 468 469 | browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } }, showError); } function sendCommandToAllTabs (sCommand) { for (let [iTab, xTabPort] of dConnx.entries()) { | | | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } }, showError); } function sendCommandToAllTabs (sCommand) { for (let [iTab, xTabPort] of dConnx.entries()) { xTabPort.postMessage({sActionDone: sCommand, result: null, oInfo: null, bEnd: false, bError: false}); } } function openLexiconEditor (sName="__personal__") { if (nTabLexiconEditor === null) { if (bChrome) { browser.tabs.create({ |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/init.js from [39a18c330c] to [b745010b16].
︙ | ︙ | |||
308 309 310 311 312 313 314 | xConnect: browser.runtime.connect({name: "content-script port"}), /* Send messages to the background object { sCommand: the action to perform | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | xConnect: browser.runtime.connect({name: "content-script port"}), /* Send messages to the background object { sCommand: the action to perform oParam: parameters necessary for the execution of the action oInfo: all kind of informations that needs to be sent back (usually to know where to use the result) } */ parseAndSpellcheck: function (sText, sDestination) { this.xConnect.postMessage({ sCommand: "parseAndSpellcheck", oParam: { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, oInfo: { sDestination: sDestination } }); }, parseAndSpellcheck1: function (sText, sDestination, sParagraphId) { this.xConnect.postMessage({ sCommand: "parseAndSpellcheck1", oParam: { sText: sText, sCountry: "FR", bDebug: false, bContext: false }, oInfo: { sDestination: sDestination, sParagraphId: sParagraphId } }); }, getListOfTokens: function (sText) { this.xConnect.postMessage({ sCommand: "getListOfTokens", oParam: { sText: sText }, oInfo: {} }); }, parseFull: function (sText) { this.xConnect.postMessage({ sCommand: "parseFull", oParam: { sText: sTex, sCountry: "FR", bDebug: false, bContext: false }, oInfo: {} }); }, getVerb: function (sVerb, bStart=true, bPro=false, bNeg=false, bTpsCo=false, bInt=false, bFem=false) { this.xConnect.postMessage({ sCommand: "getVerb", oParam: { sVerb: sVerb, bPro: bPro, bNeg: bNeg, bTpsCo: bTpsCo, bInt: bInt, bFem: bFem }, oInfo: { bStart: bStart } }); }, getSpellSuggestions: function (sWord, sDestination, sErrorId) { this.xConnect.postMessage({ sCommand: "getSpellSuggestions", oParam: { sWord: sWord }, oInfo: { sDestination: sDestination, sErrorId: sErrorId } }); }, openURL: function (sURL) { this.xConnect.postMessage({ sCommand: "openURL", oParam: { "sURL": sURL }, oInfo: null }); }, openLexiconEditor: function () { this.xConnect.postMessage({ sCommand: "openLexiconEditor", oParam: null, oInfo: null }); }, restartWorker: function (nTimeDelay=10) { this.xConnect.postMessage({ sCommand: "restartWorker", oParam: { "nTimeDelay": nTimeDelay }, oInfo: {} }); }, /* Messages from the background */ listen: function () { this.xConnect.onMessage.addListener(function (oMessage) { let {sActionDone, result, oInfo, bEnd, bError} = oMessage; switch (sActionDone) { case "init": oGrammalecte.sExtensionUrl = oMessage.sUrl; oGrammalecte.listenRightClick(); oGrammalecte.createButtons(); oGrammalecte.observePage(); break; case "parseAndSpellcheck": if (oInfo.sDestination == "__GrammalectePanel__") { if (!bEnd) { oGrammalecte.oGCPanel.addParagraphResult(result); } else { oGrammalecte.oGCPanel.stopWaitIcon(); oGrammalecte.oGCPanel.endTimer(); } } else if (oInfo.sDestination && document.getElementById(oInfo.sDestination)) { const xEvent = new CustomEvent("GrammalecteResult", { detail: JSON.stringify({ sType: "errors", oResult: result, oInfo: oInfo }) }); document.getElementById(oInfo.sDestination).dispatchEvent(xEvent); } break; case "parseAndSpellcheck1": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.refreshParagraph(oInfo.sParagraphId, result); } break; case "parseFull": // TODO break; case "getListOfTokens": if (!bEnd) { oGrammalecte.oGCPanel.addListOfTokens(result); } else { oGrammalecte.oGCPanel.stopWaitIcon(); oGrammalecte.oGCPanel.endTimer(); } break; case "getSpellSuggestions": if (oInfo.sDestination == "__GrammalectePanel__") { oGrammalecte.oGCPanel.oTooltip.setSpellSuggestionsFor(result.sWord, result.aSugg, result.iSuggBlock, oInfo.sErrorId); } else if (oInfo.sDestination && document.getElementById(oInfo.sDestination)) { const xEvent = new CustomEvent("GrammalecteResult", { detail: JSON.stringify({ sType: "spellsugg", oResult: result, oInfo: oInfo }) }); document.getElementById(oInfo.sDestination).dispatchEvent(xEvent); } break; case "getVerb": if (oInfo.bStart) { oGrammalecte.oGCPanel.conjugateWith(result.oVerb, result.oConjTable); } else { oGrammalecte.oGCPanel.displayConj(result.oConjTable); } break; case "workerRestarted": oGrammalecte.oGCPanel.stopWaitIcon(); |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_worker.js from [1361b7ed42] to [2a88013ffc].
︙ | ︙ | |||
54 55 56 57 58 59 60 | Warning. Initialization can’t be completed at startup of the worker, for we need the path of the extension to load data stored in JSON files. This path is retrieved in background.js and passed with the event “init”. */ | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | Warning. Initialization can’t be completed at startup of the worker, for we need the path of the extension to load data stored in JSON files. This path is retrieved in background.js and passed with the event “init”. */ function createResponse (sActionDone, result, oInfo, bEnd, bError=false) { return { "sActionDone": sActionDone, "result": result, // can be of any type "oInfo": oInfo, "bEnd": bEnd, "bError": bError }; } function createErrorResult (e, sDescr="no description") { return { |
︙ | ︙ | |||
85 86 87 88 89 90 91 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ onmessage = function (e) { | | | | | | | | | | | | | | | | | | | | 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 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ onmessage = function (e) { let {sCommand, oParam, oInfo} = e.data; switch (sCommand) { case "init": init(oParam.sExtensionPath, oParam.dOptions, oParam.sContext, oInfo); break; case "parse": parse(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseAndSpellcheck": parseAndSpellcheck(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseAndSpellcheck1": parseAndSpellcheck1(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "parseFull": parseFull(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "getListOfTokens": getListOfTokens(oParam.sText, oInfo); break; case "getOptions": getOptions(oInfo); break; case "getDefaultOptions": getDefaultOptions(oInfo); break; case "setOptions": setOptions(oParam.sOptions, oInfo); break; case "setOption": setOption(oParam.sOptName, oParam.bValue, oInfo); break; case "resetOptions": resetOptions(oInfo); break; case "textToTest": textToTest(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext, oInfo); break; case "fullTests": fullTests(oInfo); break; case "setDictionary": setDictionary(oParam.sDictionary, oParam.oDict, oInfo); break; case "setDictionaryOnOff": setDictionaryOnOff(oParam.sDictionary, oParam.bActivate, oInfo); break; case "getSpellSuggestions": getSpellSuggestions(oParam.sWord, oInfo); break; case "getVerb": getVerb(oParam.sVerb, oParam.bPro, oParam.bNeg, oParam.bTpsCo, oParam.bInt, oParam.bFem, oInfo); break; default: console.log("[Worker] Unknown command: " + sCommand); showData(e.data); } } |
︙ | ︙ | |||
164 165 166 167 168 169 170 | This worker don’t work as a PromiseWorker (which returns a promise), so when we send request to this worker, we can’t wait the return of the answer just after the request made. The answer is received by the background in another function (onmessage). That’s why the full text to analyze is send in one block, but analyse is returned paragraph by paragraph. */ | | | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | This worker don’t work as a PromiseWorker (which returns a promise), so when we send request to this worker, we can’t wait the return of the answer just after the request made. The answer is received by the background in another function (onmessage). That’s why the full text to analyze is send in one block, but analyse is returned paragraph by paragraph. */ function init (sExtensionPath, dOptions=null, sContext="JavaScript", oInfo={}) { try { if (!bInitDone) { //console.log("[Worker] Loading… Extension path: " + sExtensionPath); conj.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/conj_data.json")); phonet.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/phonet_data.json")); mfsp.init(helpers.loadFile(sExtensionPath + "/grammalecte/fr/mfsp_data.json")); //console.log("[Worker] Modules have been initialized…"); |
︙ | ︙ | |||
191 192 193 194 195 196 197 | //tests(); bInitDone = true; } else { console.log("[Worker] Already initialized…") } // we always retrieve options from the gc_engine, for setOptions filters obsolete options dOptions = helpers.mapToObject(gc_engine.getOptions()); | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | //tests(); bInitDone = true; } else { console.log("[Worker] Already initialized…") } // we always retrieve options from the gc_engine, for setOptions filters obsolete options dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("init", dOptions, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("init", createErrorResult(e, "init failed"), oInfo, true, true)); } } function parse (sText, sCountry, bDebug, bContext, oInfo={}) { sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, bContext); postMessage(createResponse("parse", aGrammErr, oInfo, false)); } postMessage(createResponse("parse", null, oInfo, true)); } function parseAndSpellcheck (sText, sCountry, bDebug, bContext, oInfo={}) { let i = 0; sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck", {sParagraph: sParagraph, iParaNum: i, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, false)); i += 1; } postMessage(createResponse("parseAndSpellcheck", null, oInfo, true)); } function parseAndSpellcheck1 (sParagraph, sCountry, bDebug, bContext, oInfo={}) { sParagraph = sParagraph.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext); let aSpellErr = oSpellChecker.parseParagraph(sParagraph); postMessage(createResponse("parseAndSpellcheck1", {sParagraph: sParagraph, aGrammErr: aGrammErr, aSpellErr: aSpellErr}, oInfo, true)); } function parseFull (sText, sCountry, bDebug, bContext, oInfo={}) { let i = 0; sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { let lSentence = gc_engine.parse(sParagraph, sCountry, bDebug, null, bContext, true); console.log("*", lSentence); postMessage(createResponse("parseFull", {sParagraph: sParagraph, iParaNum: i, lSentence: lSentence}, oInfo, false)); i += 1; } postMessage(createResponse("parseFull", null, oInfo, true)); } function getListOfTokens (sText, oInfo={}) { // lexicographer try { sText = sText.replace(//g, "").normalize("NFC"); for (let sParagraph of text.getParagraph(sText)) { if (sParagraph.trim() !== "") { postMessage(createResponse("getListOfTokens", oLxg.getListOfTokensReduc(sParagraph, true), oInfo, false)); } } postMessage(createResponse("getListOfTokens", null, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("getListOfTokens", createErrorResult(e, "no tokens"), oInfo, true, true)); } } function getOptions (oInfo={}) { let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("getOptions", dOptions, oInfo, true)); } function getDefaultOptions (oInfo={}) { let dOptions = helpers.mapToObject(gc_engine.getDefaultOptions()); postMessage(createResponse("getDefaultOptions", dOptions, oInfo, true)); } function setOptions (dOptions, oInfo={}) { if (!(dOptions instanceof Map)) { dOptions = helpers.objectToMap(dOptions); } gc_engine.setOptions(dOptions); dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("setOptions", dOptions, oInfo, true)); } function setOption (sOptName, bValue, oInfo={}) { console.log(sOptName+": "+bValue); if (sOptName) { gc_engine.setOption(sOptName, bValue); let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("setOption", dOptions, oInfo, true)); } } function resetOptions (oInfo={}) { gc_engine.resetOptions(); let dOptions = helpers.mapToObject(gc_engine.getOptions()); postMessage(createResponse("resetOptions", dOptions, oInfo, true)); } function tests () { console.log(conj.getConj("devenir", ":E", ":2s")); console.log(mfsp.getMasForm("emmerdeuse", true)); console.log(mfsp.getMasForm("pointilleuse", false)); console.log(phonet.getSimil("est")); let aRes = gc_engine.parse("Je suit..."); for (let oErr of aRes) { console.log(text.getReadableError(oErr)); } } function textToTest (sText, sCountry, bDebug, bContext, oInfo={}) { if (!gc_engine) { postMessage(createResponse("textToTest", "# Grammar checker not loaded.", oInfo, true)); return; } sText = sText.replace(//g, "").normalize("NFC"); let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext); let sMsg = ""; for (let oErr of aGrammErr) { sMsg += text.getReadableError(oErr) + "\n"; } if (sMsg == "") { sMsg = "Aucune erreur détectée."; } postMessage(createResponse("textToTest", sMsg, oInfo, true)); } function fullTests (oInfo={}) { if (!gc_engine) { postMessage(createResponse("fullTests", "# Grammar checker not loaded.", oInfo, true)); return; } let dMemoOptions = gc_engine.getOptions(); let dTestOptions = gc_engine.getDefaultOptions(); dTestOptions.set("nbsp", true); dTestOptions.set("esp", true); dTestOptions.set("unit", true); dTestOptions.set("num", true); gc_engine.setOptions(dTestOptions); let sMsg = ""; for (let sRes of oTest.testParse()) { sMsg += sRes + "\n"; console.log(sRes); } gc_engine.setOptions(dMemoOptions); postMessage(createResponse("fullTests", sMsg, oInfo, true)); } // SpellChecker function setDictionary (sDictionary, oDict, oInfo) { if (!oSpellChecker) { postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", oInfo, true)); return; } //console.log("setDictionary", sDictionary); switch (sDictionary) { case "main": oSpellChecker.setMainDictionary(oDict, oInfo["sExtPath"]+"/grammalecte/graphspell/_dictionaries"); break; case "community": oSpellChecker.setCommunityDictionary(oDict); break; case "personal": oSpellChecker.setPersonalDictionary(oDict); break; default: console.log("[worker] setDictionary: Unknown dictionary <"+sDictionary+">"); } postMessage(createResponse("setDictionary", true, oInfo, true)); } function setDictionaryOnOff (sDictionary, bActivate, oInfo) { if (!oSpellChecker) { postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", oInfo, true)); return; } //console.log("setDictionaryOnOff", sDictionary, bActivate); switch (sDictionary) { case "community": if (bActivate) { oSpellChecker.activateCommunityDictionary(); |
︙ | ︙ | |||
389 390 391 392 393 394 395 | } else { oSpellChecker.deactivatePersonalDictionary(); } break; default: console.log("[worker] setDictionaryOnOff: Unknown dictionary <"+sDictionary+">"); } | | | | | | | | | 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 | } else { oSpellChecker.deactivatePersonalDictionary(); } break; default: console.log("[worker] setDictionaryOnOff: Unknown dictionary <"+sDictionary+">"); } postMessage(createResponse("setDictionaryOnOff", true, oInfo, true)); } function getSpellSuggestions (sWord, oInfo) { if (!oSpellChecker) { postMessage(createResponse("getSpellSuggestions", "# Error. SpellChecker not loaded.", oInfo, true)); return; } let i = 0; for (let aSugg of oSpellChecker.suggest(sWord)) { postMessage(createResponse("getSpellSuggestions", {sWord: sWord, aSugg: aSugg, iSuggBlock: i}, oInfo, true)); i += 1; } } // Conjugueur function getVerb (sWord, bPro, bNeg, bTpsCo, bInt, bFem, oInfo) { try { let oVerb = null; let oConjTable = null; if (conj.isVerb(sWord)) { oVerb = new Verb(sWord); oConjTable = oVerb.createConjTable(bPro, bNeg, bTpsCo, bInt, bFem); } postMessage(createResponse("getVerb", { oVerb: oVerb, oConjTable: oConjTable }, oInfo, true)); } catch (e) { console.error(e); postMessage(createResponse("getVerb", createErrorResult(e, "no verb"), oInfo, true, true)); } } |
Modified gc_lang/fr/webext/panel/dictionaries.js from [185528ef06] to [a0f430df19].
︙ | ︙ | |||
423 424 425 426 427 428 429 | for (let sName of this.dSelectedDictionaries.keys()) { lDict.push(this.dDict.get(sName)); } let oDict = dic_merger.merge(lDict, "S", "fr", "Français", "fr.community", "Dictionnaire communautaire (personnalisé)", this.xProgressBar); console.log(oDict); browser.storage.local.set({ "community_dictionary": oDict }); browser.storage.local.set({ "selected_dictionaries_list": Array.from(this.dSelectedDictionaries.keys()) }); | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | for (let sName of this.dSelectedDictionaries.keys()) { lDict.push(this.dDict.get(sName)); } let oDict = dic_merger.merge(lDict, "S", "fr", "Français", "fr.community", "Dictionnaire communautaire (personnalisé)", this.xProgressBar); console.log(oDict); browser.storage.local.set({ "community_dictionary": oDict }); browser.storage.local.set({ "selected_dictionaries_list": Array.from(this.dSelectedDictionaries.keys()) }); browser.runtime.sendMessage({ sCommand: "setDictionary", oParam: {sDictionary: "community", oDict: oDict}, oInfo: {} }); } } const oDicTable = new Table("dictionaries_table", ["Nom", "Entrées", "Description", "Date"], "wait_progress", "num_dic", false, true); oDicTable.init(); |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/lex_editor.js from [a72eb5ad85] to [621914c742].
︙ | ︙ | |||
589 590 591 592 593 594 595 | saveDictionary: function (sName, oJSON) { if (!sName) { console.log("Error: name of dictionary to save is empty.") return; } if (sName == "__personal__") { | | | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | saveDictionary: function (sName, oJSON) { if (!sName) { console.log("Error: name of dictionary to save is empty.") return; } if (sName == "__personal__") { browser.runtime.sendMessage({ sCommand: "setDictionary", oParam: {sDictionary: "personal", oDict: oJSON}, oInfo: {} }); browser.storage.local.set({ "personal_dictionary": oJSON }); } else { this.oDictionaries[sName] = oJSON; if (oJSON === null) { delete this.oDictionaries[sName]; } |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/main.js from [56de373e52] to [0cb6672536].
︙ | ︙ | |||
24 25 26 27 28 29 30 | function (xEvent) { let xElem = xEvent.target; if (xElem.id) { // tests if (xElem.id === "text_to_test_button") { browser.runtime.sendMessage({ sCommand: "textToTest", | | | | | | | | | | | | | | | | | | | | | | | | 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 | function (xEvent) { let xElem = xEvent.target; if (xElem.id) { // tests if (xElem.id === "text_to_test_button") { browser.runtime.sendMessage({ sCommand: "textToTest", oParam: {sText: document.getElementById("text_to_test").value, sCountry: "FR", bDebug: true, bContext: false}, oInfo: {} }); } else if (xElem.id === "fulltests_button") { document.getElementById("tests_result").textContent = "Veuillez patienter…"; browser.runtime.sendMessage({ sCommand: "fullTests", oParam: {}, oInfo: {} }); } else if (xElem.id == "restart_worker") { browser.runtime.sendMessage({ sCommand: "restartWorker", oParam: { "nDelayLimit": 3 }, oInfo: {} }); } // grammar options else if (xElem.id === "default_options_button") { browser.runtime.sendMessage({ sCommand: "resetOptions", oParam: {}, oInfo: {} }); } else if (xElem.id.startsWith("option_")) { if (xElem.dataset.option) { browser.runtime.sendMessage({ sCommand: "setOption", oParam: {sOptName: xElem.dataset.option, bValue: xElem.checked}, oInfo: {} }); } } // dictionaries options else if (xElem.id.endsWith("_dic")) { if (xElem.dataset.dictionary) { storeSCOptions(); browser.runtime.sendMessage({ sCommand: "setDictionaryOnOff", oParam: {sDictionary: xElem.dataset.dictionary, bActivate: xElem.checked}, oInfo: {} }); } } else if (xElem.id.startsWith("spelling_")) { updateSpellingChoiceUI(xElem.id); let sMainDicName = document.getElementById(xElem.id).dataset.dicname; browser.storage.local.set({"main_dic_name": sMainDicName}); browser.runtime.sendMessage({ sCommand: "setDictionary", oParam: { sDictionary: "main", oDict: sMainDicName }, oInfo: { sExtPath: browser.extension.getURL("") } }); } // UI options else if (xElem.id.startsWith("ui_option_")) { storeUIOptions(); } // else if (xElem.id.startsWith("link_")) { browser.tabs.create({url: xElem.dataset.url}); } else if (xElem.id == "conj_button") { browser.runtime.sendMessage({ sCommand: "openConjugueurTab", oParam: {}, oInfo: {} }); } else if (xElem.id == "dictionaries_button") { browser.runtime.sendMessage({ sCommand: "openDictionaries", oParam: {}, oInfo: {} }); } else if (xElem.id == "dic_community_button") { browser.runtime.sendMessage({ sCommand: "openLexiconEditor", oParam: { "dictionary": "__community__"}, oInfo: {} }); } else if (xElem.id == "dic_personal_button") { browser.runtime.sendMessage({ sCommand: "openLexiconEditor", oParam: { "dictionary": "__personal__"}, oInfo: {} }); } // change UI page } else if (xElem.className.startsWith("select")) { showPage(xElem.dataset.page); }/* else if (xElem.tagName === "A") { openURL(xElem.getAttribute("href")); |
︙ | ︙ | |||
152 153 154 155 156 157 158 | } /* Messages received */ function handleMessage (oMessage, xSender, sendResponse) { | | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | } /* Messages received */ function handleMessage (oMessage, xSender, sendResponse) { let {sActionDone, result, oInfo, bEnd, bError} = oMessage; switch(sActionDone) { case "textToTest": case "fullTests": showTestResult(result); break; case "resetOptions": displayGCOptions(result); |
︙ | ︙ |