Overview
Comment: | [fx] lexicon editor: launch from main panel and prevent multi-tabs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | fx | comdic |
Files: | files | file ages | folders |
SHA3-256: |
52dc932e3849a275763eec53efc00acf |
User & Date: | olr on 2018-12-10 17:56:03 |
Other Links: | branch diff | manifest | tags |
Context
2018-12-11
| ||
18:50 | [fx] page for dictionaries (draft) check-in: 09a2b4f200 user: olr tags: fx, comdic | |
2018-12-10
| ||
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 | |
Changes
Modified gc_lang/fr/webext/background.js from [56f4ad093d] to [50b00ff19b].
︙ | ︙ | |||
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 | case "setDictionary": case "setDictionaryOnOff": xGCEWorker.postMessage(oRequest); break; case "openURL": browser.tabs.create({url: dParam.sURL}); 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) { 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, dParam, dInfo} = oRequest; switch (sCommand) { case "parse": case "parseAndSpellcheck": | > > > > > > > | 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 | case "setDictionary": case "setDictionaryOnOff": xGCEWorker.postMessage(oRequest); break; case "openURL": browser.tabs.create({url: dParam.sURL}); break; case "openConjugueurTab": openConjugueurTab(); break; case "openLexiconEditor": openLexiconEditor(dParam["dictionary"]); 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, dParam, dInfo} = oRequest; switch (sCommand) { case "parse": case "parseAndSpellcheck": |
︙ | ︙ | |||
347 348 349 350 351 352 353 | case "conjugueur_tab": openConjugueurTab(); break; case "conjugueur_window": openConjugueurWindow(); break; case "lex_editor": | | > > > > > > > > > > > > | > | | | < > | | | | | | > > > > > > | 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 | case "conjugueur_tab": openConjugueurTab(); break; case "conjugueur_window": openConjugueurWindow(); break; case "lex_editor": openLexiconEditor(); break; } }); /* Lexicon editor tab */ let nTabLexiconEditor = null; browser.tabs.onRemoved.addListener(function (nTabId, xRemoveInfo) { if (nTabId === nTabLexiconEditor) { nTabLexiconEditor = null; } }); /* Actions */ function storeGCOptions (dOptions) { if (dOptions instanceof Map) { dOptions = helpers.mapToObject(dOptions); } browser.storage.local.set({"gc_options": dOptions}); } function sendCommandToTab (sCommand, iTab) { let xTabPort = dConnx.get(iTab); xTabPort.postMessage({sActionDone: sCommand, result: null, dInfo: null, bEnd: false, bError: false}); } function openLexiconEditor (sName="__personal__") { if (nTabLexiconEditor === null) { if (bChrome) { browser.tabs.create({ url: browser.extension.getURL("panel/lex_editor.html") }, onLexiconEditorOpened); return; } let xLexEditor = browser.tabs.create({ url: browser.extension.getURL("panel/lex_editor.html") }); xLexEditor.then(onLexiconEditorOpened, onError); } } function onLexiconEditorOpened (xTab) { //console.log(xTab); nTabLexiconEditor = xTab.id; } function openConjugueurTab () { if (bChrome) { browser.tabs.create({ url: browser.extension.getURL("panel/conjugueur.html") }); |
︙ | ︙ | |||
420 421 422 423 424 425 426 | function onCreated (xWindowInfo) { //console.log(`Created window: ${xWindowInfo.id}`); } function onError (error) { | | | 446 447 448 449 450 451 452 453 454 | function onCreated (xWindowInfo) { //console.log(`Created window: ${xWindowInfo.id}`); } function onError (error) { console.log(error); } |
Modified gc_lang/fr/webext/panel/main.css from [85a3951146] to [11481222d3].
︙ | ︙ | |||
82 83 84 85 86 87 88 | height: 500px; font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } body { width: 450px; height: 500px; } | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | height: 500px; font-family: "Trebuchet MS", "Fira Sans", "Liberation Sans", sans-serif; } body { width: 450px; height: 500px; } /* Maximal height of a panel in WebExtention seems to be 500px. When going over this limit, a scrollbar appears which destructs the horizontal balance of elements. --> vertical scrolling is done with overflow in #page. #page must have the same height than body. */ |
︙ | ︙ | |||
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 | padding: 5px 10px; border-radius: 3px; font-size: 16px; text-align: center; cursor: pointer; } /* Spell checking options */ #sc_options_page { display: none; padding: 20px; } .dictionaries_info { margin: 10px 0; padding: 10px; border-radius: 3px; background-color: hsl(0, 50%, 40%); color: hsl(0, 10%, 96%); } #sc_options_page h2 { margin-top: 20px; font: normal 22px 'Yanone Kaffeesatz', "Oswald", "Liberation Sans Narrow", sans-serif; color: hsl(210, 50%, 50%); } | > > > > > > > > > > > > > > > > > > > | < | < < | < < | < < < < | < < < < | | > > | 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 | padding: 5px 10px; border-radius: 3px; font-size: 16px; text-align: center; cursor: pointer; } .option_section { padding: 10px; margin-top: 10px; border-radius: 5px; background-color: hsl(210, 20%, 96%); } .option_section label { font-size: 16px; line-height: 20px; color: hsl(210, 20%, 50%); font-weight: bold; } .option_description { padding: 0 0 0 20px; color: hsl(0, 0%, 0%); font-size: 12px; } /* Spell checking options */ #sc_options_page { display: none; padding: 20px; } .dictionaries_info { margin: 10px 0; padding: 10px; border-radius: 3px; background-color: hsl(0, 50%, 40%); color: hsl(0, 10%, 96%); } #sc_options_page h2 { margin-top: 20px; font: normal 22px 'Yanone Kaffeesatz', "Oswald", "Liberation Sans Narrow", sans-serif; color: hsl(210, 50%, 50%); } .dic_button { float: right; padding: 2px 10px; background-color: hsl(210, 50%, 50%); color: hsl(210, 10%, 96%); cursor: pointer; font-size: 14px; font-variant-caps: small-caps; border-radius: 3px; } /* Test page */ #test_page { |
︙ | ︙ | |||
370 371 372 373 374 375 376 | animation: sk-bounce 2.0s infinite ease-in-out; } .double-bounce2 { animation-delay: -1.0s; } @keyframes sk-bounce { | | | | 378 379 380 381 382 383 384 385 386 387 388 389 390 | animation: sk-bounce 2.0s infinite ease-in-out; } .double-bounce2 { animation-delay: -1.0s; } @keyframes sk-bounce { 0%, 100% { transform: scale(0.0); } 50% { transform: scale(1.0); } } |
Modified gc_lang/fr/webext/panel/main.html from [6dfd86820a] to [cca667b1f3].
︙ | ︙ | |||
104 105 106 107 108 109 110 | <div id="default_options_button" class="button blue center">Options par défaut</div> </section> <!-- #gc_options_page --> <section id="sc_options_page" class="page"> <h1>OPTIONS ORTHOGRAPHIQUES</h1> <div id="hunspell_options"> <h2>DICTIONNAIRES DE GRAMMALECTE</h2> | < | | | | > | > | | 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 | <div id="default_options_button" class="button blue center">Options par défaut</div> </section> <!-- #gc_options_page --> <section id="sc_options_page" class="page"> <h1>OPTIONS ORTHOGRAPHIQUES</h1> <div id="hunspell_options"> <h2>DICTIONNAIRES DE GRAMMALECTE</h2> <div class="option_section" id="main_dic_box"> <p><input type="checkbox" id="main_dic" data-dictionary="main" 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.<br/>Ce dictionnaire est créé à partir du dictionnaire orthographique pour Firefox et LibreOffice, conçu sur le <a id="link_grammalecte" class="link" data-url="http://grammalecte.net/home.php?prj=fr">site de Grammalecte</a>.</p> </div> <div class="option_section" id="community_dic_box"> <p><input type="checkbox" id="community_dic" data-dictionary="community" /> <label for="community_dic">Dictionnaire communautaire</label></p> <div class="dic_button" id="dic_community_button">Éditer</div> <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical et est sauvegardé sur un serveur en ligne accessible à tous les membres.</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> <div class="dic_button" id="dic_personal_button">Éditer</div> <p class="option_description">Ce dictionnaire est créé et édité via l’éditeur lexical et n’est pas partagé.</p> </div> </div> <div id="hunspell_options" style="display: none; opacity: .25"> <h2>DICTIONNAIRES HUNSPELL</h2> <p class="dictionaries_info">Les dictionnaires Hunspell ne sont utilisées que pour la correction orthographique proposée par Firefox (soulignement rouge).<br/><br/>Section inactive.<br/>Le système d’extension <i>WebExtension</i> ne propose pas encore d’interface de programmation pour le correcteur orthographique.</p> <div class="option_section" id="fr-FR-modern_box"> |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/main.js from [d7a3e529e8] to [1d5858eab5].
︙ | ︙ | |||
68 69 70 71 72 73 74 | 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") { | > | > > > > > > > > > > > > > > > > > | | | 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 | 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", dParam: {}, dInfo: {} }); } else if (xElem.id == "dic_community_button") { browser.runtime.sendMessage({ sCommand: "openLexiconEditor", dParam: { "dictionary": "__community__"}, dInfo: {} }); } else if (xElem.id == "dic_personal_button") { browser.runtime.sendMessage({ sCommand: "openLexiconEditor", dParam: { "dictionary": "__personal__"}, dInfo: {} }); } } else if (xElem.className.startsWith("select")) { showPage(xElem.dataset.page); }/* else if (xElem.tagName === "A") { openURL(xElem.getAttribute("href")); }*/ }, false ); /* Message sender and response handling */ function handleResponse (oResponse) { console.log(`[Panel] received:`); console.log(oResponse); } function handleError (error) { console.log(`[Panel] Error:`); console.log(error); } function sendMessageAndWaitResponse (oData) { let xPromise = browser.runtime.sendMessage(oData); xPromise.then(handleResponse, handleError); } /* Messages received */ function handleMessage (oMessage, xSender, sendResponse) { |
︙ | ︙ | |||
154 155 156 157 158 159 160 | } function showTestResult (sText) { document.getElementById("tests_result").textContent = sText; } | < < < < < < < < < < < < < < < < < < < < < < < < < < | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 | } function showTestResult (sText) { document.getElementById("tests_result").textContent = sText; } /* UI options */ function displayUIOptionsLoadedFromStorage () { if (bChrome) { browser.storage.local.get("ui_options", displayUIOptions); |
︙ | ︙ | |||
233 234 235 236 237 238 239 | function displaySCOptions (dOptions) { if (!dOptions.hasOwnProperty("sc_options")) { console.log("no sc options found"); return; } dOptions = dOptions.sc_options; //document.getElementById("extended_dic").checked = dOptions.extended_dic; | | | | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | function displaySCOptions (dOptions) { if (!dOptions.hasOwnProperty("sc_options")) { console.log("no sc options found"); return; } dOptions = dOptions.sc_options; //document.getElementById("extended_dic").checked = dOptions.extended_dic; document.getElementById("community_dic").checked = dOptions.community_dic; document.getElementById("personal_dic").checked = dOptions.personal; } function storeSCOptions () { browser.storage.local.set({"sc_options": { extended: false, community: document.getElementById("community_dic").checked, personal: document.getElementById("personal_dic").checked }}); } /* GC options |
︙ | ︙ |