Changes In Branch comdic Through [ad98751778] Excluding Merge-Ins
This is equivalent to a diff from 7c125ca2fe to ad98751778
2018-12-10
| ||
18:46 | [fr] màj: confusion ont/on check-in: 4e3d4dc43f user: olr tags: trunk, fr | |
17:56 | [fx] lexicon editor: launch from main panel and prevent multi-tabs check-in: 52dc932e38 user: olr tags: fx, comdic | |
14:27 | merge trunk check-in: ad98751778 user: olr tags: comdic | |
14:13 | [fr] mise à jour du dictionnaire check-in: 7c125ca2fe user: olr tags: trunk, fr | |
13:45 | [fr] faux positif check-in: 0684165bf2 user: olr tags: trunk, fr | |
11:32 | [fx] lexicon editor: dictionary selector check-in: 833a8d3dce user: olr tags: fx, comdic | |
Modified gc_lang/fr/webext/background.js from [52ec35f9bc] to [56f4ad093d].
︙ | ︙ | |||
115 116 117 118 119 120 121 | xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: sDictionary, bActivate: bActivate }, dInfo: {} }); } | | | < < < | | | | > > > | > | > | | | | > | < | | < | | 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 | xGCEWorker.postMessage({ sCommand: "setDictionaryOnOff", dParam: { sDictionary: sDictionary, bActivate: bActivate }, dInfo: {} }); } function initSCOptions (oData) { if (!oData.hasOwnProperty("sc_options")) { browser.storage.local.set({"sc_options": { extended: true, community: true, personal: true }}); setDictionaryOnOff("community", true); setDictionaryOnOff("personal", true); } else { setDictionaryOnOff("community", oData.sc_options["community"]); setDictionaryOnOff("personal", oData.sc_options["personal"]); } } function setDictionary (sDictionary, oDictionary) { xGCEWorker.postMessage({ sCommand: "setDictionary", dParam: { sDictionary: sDictionary, oDict: oDictionary }, dInfo: {} }); } function setSpellingDictionaries (oData) { if (oData.hasOwnProperty("oPersonalDictionary")) { // deprecated console.log("personal dictionary migration"); browser.storage.local.set({ "dictionaries": { "__personal__": oData["oPersonalDictionary"] } }); setDictionary("personal", oData["oPersonalDictionary"]); browser.storage.local.remove("oPersonalDictionary"); } if (oData.hasOwnProperty("dictionaries")) { if (oData.dictionaries.hasOwnProperty("__personal__")) { setDictionary("personal", oData.dictionaries["__personal__"]); } if (oData.dictionaries.hasOwnProperty("__community__")) { setDictionary("personal", oData.dictionaries["__community__"]); } } } function init () { if (bChrome) { browser.storage.local.get("gc_options", initGrammarChecker); browser.storage.local.get("ui_options", initUIOptions); browser.storage.local.get("dictionaries", setSpellingDictionaries); browser.storage.local.get("oPersonalDictionary", setSpellingDictionaries); // deprecated browser.storage.local.get("sc_options", initSCOptions); return; } browser.storage.local.get("gc_options").then(initGrammarChecker, showError); browser.storage.local.get("ui_options").then(initUIOptions, showError); browser.storage.local.get("dictionaries").then(setSpellingDictionaries, showError); browser.storage.local.get("oPersonalDictionary").then(setSpellingDictionaries, showError); // deprecated browser.storage.local.get("sc_options").then(initSCOptions, showError); } init(); browser.runtime.onInstalled.addListener(function (oDetails) { |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_worker.js from [f9f8b2256b] to [08f4a4604e].
︙ | ︙ | |||
316 317 318 319 320 321 322 | return; } //console.log("setDictionary", sDictionary); switch (sDictionary) { case "main": oSpellChecker.setMainDictionary(oDict); break; | < < < < < < < < < < | 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 | return; } //console.log("setDictionary", sDictionary); switch (sDictionary) { case "main": oSpellChecker.setMainDictionary(oDict); 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, dInfo, true)); } function setDictionaryOnOff (sDictionary, bActivate, dInfo) { if (!oSpellChecker) { postMessage(createResponse("setDictionary", "# Error. SpellChecker not loaded.", dInfo, true)); return; } //console.log("setDictionaryOnOff", sDictionary, bActivate); switch (sDictionary) { case "community": if (bActivate) { oSpellChecker.activateCommunityDictionary(); } else { oSpellChecker.deactivateCommunityDictionary(); } break; |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/lex_editor.css from [62f94b1b3b] to [5ec344ca45].
︙ | ︙ | |||
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 | font: bold 20px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } h3 { margin: 3px 0 2px 0; color: hsl(210, 50%, 50%); font: bold 16px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } details { font-size: 11px; font-variant: small-caps; color: hsl(210, 50%, 50%); cursor: pointer; } details > * { font-size: 12px; font-variant: normal; color: hsl(210, 0%, 0%); cursor: auto; } details.inline { padding: 3px; width: 260px; } /* Main buttons */ #buttons { padding: 10px 0; | > > > > > > | 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 | font: bold 20px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } h3 { margin: 3px 0 2px 0; color: hsl(210, 50%, 50%); font: bold 16px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } #dic_selector { color: hsl(210, 50%, 50%); font: bold 16px "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } details { font-size: 11px; font-variant: small-caps; color: hsl(210, 50%, 50%); cursor: pointer; } details > * { font-size: 12px; font-variant: normal; color: hsl(210, 0%, 0%); cursor: auto; } details.inline { padding: 3px; width: 260px; } /* Main buttons */ #buttons { padding: 10px 0; |
︙ | ︙ | |||
245 246 247 248 249 250 251 | background-color: hsl(150, 60%, 40%); color: hsl(150, 60%, 90%); box-shadow: 0 0 2px hsl(150, 60%, 50%); } #lexicon_page { | | | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | background-color: hsl(150, 60%, 40%); color: hsl(150, 60%, 90%); box-shadow: 0 0 2px hsl(150, 60%, 50%); } #lexicon_page { } /* Search page */ #search_page { |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/lex_editor.html from [66bbff43be] to [a9e9e38c7e].
1 2 3 4 5 6 7 | <!DOCTYPE HTML> <html> <head> <link rel="stylesheet" type="text/css" href="lex_editor.css" /> <title>Grammalecte · Éditeur lexical</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> </head> | | | > > > > > > | < | | > > | 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 35 36 37 38 39 | <!DOCTYPE HTML> <html> <head> <link rel="stylesheet" type="text/css" href="lex_editor.css" /> <title>Grammalecte · Éditeur lexical</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> </head> <body> <div class="inbox"> <h1>Éditeur lexical</h1> <div class="big_block"> <div class="dic_container"> <div><h3>Dictionnaire</h3></div> <div> <select id="dic_selector"> <option value="__personal__">personnel</option> <option value="__community__">communautaire</option> </select> </div> <div>[<span id="dic_save_date">—</span>]</div> <div><span id="dic_num_entries">0</span> entrées</div> <div> <input type="file" id="import_input" accept=".json" style="display: none;"> <label id="import_button" for="import_input">Importer</label> </div> <div id="export_button">Exporter</div> </div> <div class="dic_container"> </div> <progress id="wait_progress" value="0"></progress> </div> <div id="buttons" class="container"> <div id="lexicon_button" class="main_button">Lexique</div> |
︙ | ︙ | |||
152 153 154 155 156 157 158 | <details class="inline"> <div class="container"> <div class="examples_true">Je suis venu.<br/>Je suis parti.</div> <div class="examples_false">J’ai venu.<br/>J’ai parti.</div> </div> </details> </div> | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | <details class="inline"> <div class="container"> <div class="examples_true">Je suis venu.<br/>Je suis parti.</div> <div class="examples_false">J’ai venu.<br/>J’ai parti.</div> </div> </details> </div> <div class="space_container"> <div> <input type="checkbox" id="up_v_aa" value="a" /><label for="up_v_aa"> avoir</label> </div> <details class="inline"> <div class="container"> <div class="examples_true">J’ai mangé.<br/>J’ai prié.</div> |
︙ | ︙ | |||
227 228 229 230 231 232 233 | <p><input type="text" id="flexion" name="flexion" class="large" maxlength="20" value="" pattern="^[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ._-]+$" placeholder="flexion" /></p> <h3>Étiquettes</h3> <p><input type="text" id="tags" name="tags" class="large" maxlength="20" value="" pattern="^:[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ:._-]+$" placeholder="étiquettes" /></p> </div> </div> </div> </div> <!-- #new_word_generator --> | | | | | 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 | <p><input type="text" id="flexion" name="flexion" class="large" maxlength="20" value="" pattern="^[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ._-]+$" placeholder="flexion" /></p> <h3>Étiquettes</h3> <p><input type="text" id="tags" name="tags" class="large" maxlength="20" value="" pattern="^:[a-zA-Zà-ö0-9À-Öø-ÿØ-ßĀ-ʯ:._-]+$" placeholder="étiquettes" /></p> </div> </div> </div> </div> <!-- #new_word_generator --> <div id="generated_words"> <h2>Mots générés</h2> <table id="generated_words_table"> </table> <div id="buttonline"> <div id="add_to_lexicon">Ajouter au lexique</div> </div> </div> <!-- #generated_words --> </div> <!-- .columns --> </div> <!-- #add_page --> <div id="lexicon_page"> <h2>Votre lexique</h2> <div class="big_block"> <div id="save_button" class="fright"> Enregistrer </div> <p>Nombre d’entrées : <span id="num_entries">0</span>.</p> </div> <table id="lexicon_table"> </table> </div> <!-- #lexicon_page --> <div id="search_page"> <div class="columns"> <div style="margin-right: 20px;"> |
︙ | ︙ | |||
279 280 281 282 283 284 285 | <p style="margin-top: 50px;">La recherche par expressions régulières peut générer un nombre gigantesque de résultats. Seules les 2000 premières occurrences trouvées seront affichées. La recherche peut être longue, parce tout le graphe de mots, qui contient 500 000 flexions, sera parcouru si besoin.</p> </div> <div> <h2>Résultats</h2> <table id="search_table"> | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | <p style="margin-top: 50px;">La recherche par expressions régulières peut générer un nombre gigantesque de résultats. Seules les 2000 premières occurrences trouvées seront affichées. La recherche peut être longue, parce tout le graphe de mots, qui contient 500 000 flexions, sera parcouru si besoin.</p> </div> <div> <h2>Résultats</h2> <table id="search_table"> </table> </div> </div> </div> <!-- #search_page --> <div id="info_page"> |
︙ | ︙ | |||
309 310 311 312 313 314 315 | <h3>Étiquettes rares</h3> <p>Il est déconseillé d’utiliser la catégorie ‹Autre› pour générer autre chose que des noms, des adjectifs, des noms propres, des verbes et des adverbes. Il n’y a aucune garantie que les étiquettes pour les autres catégories, notamment les mots grammaticaux, ne changeront pas.</p> </div> <div> <table id="tags_table"> | | | | 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 | <h3>Étiquettes rares</h3> <p>Il est déconseillé d’utiliser la catégorie ‹Autre› pour générer autre chose que des noms, des adjectifs, des noms propres, des verbes et des adverbes. Il n’y a aucune garantie que les étiquettes pour les autres catégories, notamment les mots grammaticaux, ne changeront pas.</p> </div> <div> <table id="tags_table"> </table> </div> </div> </div> <!-- #info_page --> </div> <script src="../grammalecte/graphspell/helpers.js"></script> <script src="../grammalecte/graphspell/char_player.js"></script> <script src="../grammalecte/graphspell/str_transform.js"></script> <script src="../grammalecte/graphspell/dawg.js"></script> <script src="../grammalecte/graphspell/ibdawg.js"></script> <script src="../grammalecte/graphspell/spellchecker.js"></script> <script src="../grammalecte/fr/conj.js"></script> <script src="../grammalecte/fr/conj_generator.js"></script> <script src="../grammalecte/fr/lexicographe.js"></script> <script src="lex_editor.js"></script> </body> </html> |
Modified gc_lang/fr/webext/panel/lex_editor.js from [afffd7df96] to [00bc28bc12].
︙ | ︙ | |||
123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | this.xTable.appendChild(xRowNode); } clear () { while (this.xTable.firstChild) { this.xTable.removeChild(this.xTable.firstChild); } this.iEntryIndex = 0; this._createHeader(); } fill (lFlex) { this.clear(); if (lFlex.length > 0) { this.xProgressBar.max = lFlex.length; this.xProgressBar.value = 1; | > > > | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | this.xTable.appendChild(xRowNode); } clear () { while (this.xTable.firstChild) { this.xTable.removeChild(this.xTable.firstChild); } this.lEntry = []; this.nEntry = 0; this.iEntryIndex = 0; this._createHeader(); this.showEntryNumber(); } fill (lFlex) { this.clear(); if (lFlex.length > 0) { this.xProgressBar.max = lFlex.length; this.xProgressBar.value = 1; |
︙ | ︙ | |||
488 489 490 491 492 493 494 | } catch (e) { showError(e); } } } | | < < | | | | | > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > | | > > | > | > > | > > > | | | | < < < < < | | | | > | | > < | | | 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 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | } catch (e) { showError(e); } } } const oDictHandler = { oDictionaries: null, loadDictionaries: function () { if (bChrome) { browser.storage.local.get("dictionaries", this._loadDictionaries.bind(this)); return; } let xPromise = browser.storage.local.get("dictionaries"); xPromise.then(this._loadDictionaries.bind(this), showError); }, _loadDictionaries: function (oResult) { if (!oResult.hasOwnProperty("dictionaries")) { return; } this.oDictionaries = oResult.dictionaries; oBinaryDict.load("__personal__"); }, getDictionary: function (sName) { if (this.oDictionaries && this.oDictionaries.hasOwnProperty(sName)) { //console.log(this.oDictionaries[sName]); return this.oDictionaries[sName]; } return null; }, saveDictionary: function (sName, oJSON) { this.oDictionaries[sName] = oJSON; if (sName == "__personal__") { browser.runtime.sendMessage({ sCommand: "setDictionary", dParam: {sDictionary: "personal", oDict: oJSON}, dInfo: {} }); } else if (sName == "__community__") { browser.runtime.sendMessage({ sCommand: "setDictionary", dParam: {sDictionary: "community", oDict: oJSON}, dInfo: {} }); } else { // TODO: merge sub-dictionaries } this.storeDictionaries(); }, storeDictionaries: function () { browser.storage.local.set({ "dictionaries": this.oDictionaries }); } } const oBinaryDict = { oIBDAWG: null, sName: null, load: function (sName) { console.log("lexicon editor, load: " + sName); this.sName = sName; let oJSON = oDictHandler.getDictionary(sName); if (oJSON) { this.parseDict(oJSON); } else { oLexiconTable.clear(); this.setDictData(0, "[néant]"); } }, parseDict: function (oJSON) { try { this.oIBDAWG = new IBDAWG(oJSON); } catch (e) { console.error(e); this.setDictData(0, "#Erreur. Voir la console."); return; } let lEntry = []; for (let aRes of this.oIBDAWG.select()) { lEntry.push(aRes); } oLexiconTable.fill(lEntry); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); }, import: function () { let xInput = document.getElementById("import_input"); let xFile = xInput.files[0]; let xURL = URL.createObjectURL(xFile); let sJSON = helpers.loadFile(xURL); if (sJSON) { try { let oJSON = JSON.parse(sJSON); this.parseDict(oJSON); oDictHandler.saveDictionary(this.sName, oJSON); } catch (e) { console.error(e); this.setDictData(0, "#Erreur. Voir la console."); return; } } else { this.setDictData(0, "[néant]"); oDictHandler.saveDictionary(this.sName, null); } }, setDictData: function (nEntries, sDate) { document.getElementById("dic_num_entries").textContent = nEntries; document.getElementById("dic_save_date").textContent = sDate; if (nEntries == 0) { hideElement("export_button"); } else { showElement("export_button"); } }, listen: function () { document.getElementById("dic_selector").addEventListener("change", () => {this.load(document.getElementById("dic_selector").value)}, false); document.getElementById("save_button").addEventListener("click", () => { this.build(); }, false); document.getElementById("export_button").addEventListener("click", () => { this.export(); }, false); document.getElementById("import_input").addEventListener("change", () => { this.import(); }, false); }, build: function () { let xProgressNode = document.getElementById("wait_progress"); let lEntry = oLexiconTable.getEntries(); if (lEntry.length > 0) { let oDAWG = new DAWG(lEntry, "S", "fr", "Français", this.sName, xProgressNode); let oJSON = oDAWG.createBinaryJSON(1); oDictHandler.saveDictionary(this.sName, oJSON); this.oIBDAWG = new IBDAWG(oJSON); this.setDictData(this.oIBDAWG.nEntry, this.oIBDAWG.sDate); } else { oDictHandler.saveDictionary(this.sName, null); this.setDictData(0, "[néant]"); } hideElement("save_button"); }, export: function () { let xBlob = new Blob([ JSON.stringify(this.oIBDAWG.getJSON()) ], {type: 'application/json'}); let sURL = URL.createObjectURL(xBlob); browser.downloads.download({ filename: "fr."+this.sName+".json", url: sURL, saveAs: true }); } } const oSearch = { oSpellChecker: null, |
︙ | ︙ | |||
662 663 664 665 666 667 668 | const oLexiconTable = new Table("lexicon_table", ["Flexions", "Lemmes", "Étiquettes"], "wait_progress", "num_entries"); const oSearchTable = new Table("search_table", ["Flexions", "Lemmes", "Étiquettes"], "wait_progress", "search_num_entries", false); const oTagsTable = new Table("tags_table", ["Étiquette", "Signification"], "wait_progress", "", false); oTagsInfo.load(); oSearch.load(); | | | 697 698 699 700 701 702 703 704 705 706 707 708 | const oLexiconTable = new Table("lexicon_table", ["Flexions", "Lemmes", "Étiquettes"], "wait_progress", "num_entries"); const oSearchTable = new Table("search_table", ["Flexions", "Lemmes", "Étiquettes"], "wait_progress", "search_num_entries", false); const oTagsTable = new Table("tags_table", ["Étiquette", "Signification"], "wait_progress", "", false); oTagsInfo.load(); oSearch.load(); oDictHandler.loadDictionaries(); oBinaryDict.listen(); oGenerator.listen(); oTabulations.listen(); oSearch.listen(); |
Modified gc_lang/fr/webext/panel/main.html from [c94c7f3f57] to [6dfd86820a].
︙ | ︙ | |||
109 110 111 112 113 114 115 | <div id="hunspell_options"> <h2>DICTIONNAIRES DE GRAMMALECTE</h2> <p class="dictionaries_info">Ces dictionnaires ne sont utilisés que lors de l’analyse grammaticale.</p> <div class="option_section" id="main_dic_box"> <p><input type="checkbox" id="main_dic" data-dictionary="personal" checked disabled="disabled" /> <label for="main_dic">Dictionnaire principal</label></p> <p class="option_description">Environ 83 000 entrées, 500 000 flexions.<br/>Ni éditable, ni désactivable.</p> </div> | < < < < | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | <div id="hunspell_options"> <h2>DICTIONNAIRES DE GRAMMALECTE</h2> <p class="dictionaries_info">Ces dictionnaires ne sont utilisés que lors de l’analyse grammaticale.</p> <div class="option_section" id="main_dic_box"> <p><input type="checkbox" id="main_dic" data-dictionary="personal" checked disabled="disabled" /> <label for="main_dic">Dictionnaire principal</label></p> <p class="option_description">Environ 83 000 entrées, 500 000 flexions.<br/>Ni éditable, ni désactivable.</p> </div> <div class="option_section" id="community_dic_box" style="opacity: .33;"> <p><input type="checkbox" id="community_dic" data-dictionary="personal" disabled="disabled" /> <label for="community_dic">Dictionnaire communautaire</label></p> <p class="option_description">Fonctionnalité à venir.</p> </div> <div class="option_section" id="personal_dic_box"> <p><input type="checkbox" id="personal_dic" data-dictionary="personal" /> <label for="personal_dic">Dictionnaire personnel</label></p> <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical.</p> |
︙ | ︙ |