Overview
Comment: | [fx] commands via shorcuts |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | fx | comdic |
Files: | files | file ages | folders |
SHA3-256: |
019cf17655d10a6fa7de38a598dcfea1 |
User & Date: | olr on 2019-02-02 16:20:56 |
Other Links: | branch diff | manifest | tags |
Context
2019-02-02
| ||
16:40 | [core][fr] lexicographer: fix crash when empty list of tokens check-in: df41b47f9c user: olr tags: fr, core, comdic | |
16:20 | [fx] commands via shorcuts check-in: 019cf17655 user: olr tags: fx, comdic | |
11:53 | [fx] dictionaries edition: update check-in: fe9076fde1 user: olr tags: fx, comdic | |
Changes
Modified gc_lang/fr/webext/background.js from [338285a5c1] to [5137139ec8].
︙ | ︙ | |||
358 359 360 361 362 363 364 365 366 367 368 369 370 371 | /* Keyboard shortcuts */ browser.commands.onCommand.addListener(function (sCommand) { switch (sCommand) { case "conjugueur_tab": openConjugueurTab(); break; case "conjugueur_window": openConjugueurWindow(); break; case "lexicon_editor": | > > > > > > > > > | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | /* Keyboard shortcuts */ browser.commands.onCommand.addListener(function (sCommand) { switch (sCommand) { case "lexicographer": sendCommandToCurrentTab("shortcutLexicographer"); break; case "text_formatter": sendCommandToCurrentTab("shortcutTextFormatter"); break; case "grammar_checker": sendCommandToCurrentTab("shortcutGrammarChecker"); break; case "conjugueur_tab": openConjugueurTab(); break; case "conjugueur_window": openConjugueurWindow(); break; case "lexicon_editor": |
︙ | ︙ | |||
405 406 407 408 409 410 411 412 413 414 415 416 417 418 | 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); | > > > > > > > > > > > > > > > > > > > | 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 | 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 sendCommandToCurrentTab (sCommand) { console.log(sCommand); if (bChrome) { browser.tabs.query({ currentWindow: true, active: true }, (lTabs) => { for (let xTab of lTabs) { console.log(xTab); browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } }); return; } browser.tabs.query({ currentWindow: true, active: true }).then((lTabs) => { for (let xTab of lTabs) { console.log(xTab); browser.tabs.sendMessage(xTab.id, {sActionRequest: sCommand}); } }, onError); } function openLexiconEditor (sName="__personal__") { if (nTabLexiconEditor === null) { if (bChrome) { browser.tabs.create({ url: browser.extension.getURL("panel/lex_editor.html") }, onLexiconEditorOpened); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/init.js from [5366dc223c] to [f842c4b2fc].
︙ | ︙ | |||
244 245 246 247 248 249 250 | /* 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; | < | 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | /* 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; switch (sActionDone) { case "init": oGrammalecte.sExtensionUrl = oMessage.sUrl; // Start oGrammalecte.listenRightClick(); oGrammalecte.createMenus(); oGrammalecte.observePage(); |
︙ | ︙ | |||
280 281 282 283 284 285 286 | /* Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "rightClickGCEditableNode": if (oGrammalecte.xRightClickedNode !== null) { | | < < < < < < < < | < < < < < < < < | < < < < < < | | 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 | /* Commands received from the context menu (Context menu are initialized in background) */ // Grammar checker commands case "rightClickGCEditableNode": if (oGrammalecte.xRightClickedNode !== null) { parseAndSpellcheckEditableNode(oGrammalecte.xRightClickedNode); } 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": parseAndSpellcheckPage(); 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) { lexicographerEditableNode(oGrammalecte.xRightClickedNode); } 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": lexicographerPage(); break; case "rightClickLxgSelectedText": oGrammalecte.startLxgPanel(); // selected text is sent to the GC worker in the background script. break; // Text formatter command case "rightClickTFEditableNode": |
︙ | ︙ | |||
345 346 347 348 349 350 351 352 353 354 355 | oGrammalecte.showMessage("Erreur. Le node sur lequel vous avez cliqué n’a pas pu être identifié."); } break; // rescan page command case "rescanPage": oGrammalecte.rescanPage(); break; default: console.log("[Content script] Unknown command: " + sActionDone); } }); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | oGrammalecte.showMessage("Erreur. Le node sur lequel vous avez cliqué n’a pas pu être identifié."); } break; // rescan page command case "rescanPage": oGrammalecte.rescanPage(); break; } }); /* Other messages from background */ browser.runtime.onMessage.addListener(function (oMessage) { let {sActionRequest} = oMessage; let xActiveNode = document.activeElement; switch (sActionRequest) { /* Commands received from the keyboard (shortcuts) */ case "shortcutLexicographer": if (xActiveNode && (xActiveNode.tagName == "TEXTAREA" || xActiveNode.tagName == "INPUT")) { lexicographerEditableNode(xActiveNode); } else { lexicographerPage(); } break; case "shortcutTextFormatter": if (xActiveNode && (xActiveNode.tagName == "TEXTAREA" || xActiveNode.tagName == "INPUT")) { oGrammalecte.startFTPanel(xActiveNode); } break; case "shortcutGrammarChecker": if (xActiveNode && (xActiveNode.tagName == "TEXTAREA" || xActiveNode.tagName == "INPUT")) { parseAndSpellcheckEditableNode(xActiveNode); } else { parseAndSpellcheckPage(); } break; default: console.log("[Content script] Unknown command: " + sActionDone); } }); /* Actions */ function parseAndSpellcheckPage () { oGrammalecte.startGCPanel(); xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: oGrammalecte.getPageText(), sCountry: "FR", bDebug: false, bContext: false}, dInfo: {} }); } function parseAndSpellcheckEditableNode (xNode) { oGrammalecte.startGCPanel(xNode); let sText = (xNode.tagName == "TEXTAREA" || xNode.tagName == "INPUT") ? xNode.value : xNode.innerText; xGrammalectePort.postMessage({ sCommand: "parseAndSpellcheck", dParam: {sText: sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {sTextAreaId: xNode.id} }); } function lexicographerPage () { oGrammalecte.startLxgPanel(); xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: {sText: oGrammalecte.getPageText()}, dInfo: {} }); } function lexicographerEditableNode (xNode) { oGrammalecte.startLxgPanel(); let sText = (xNode.tagName == "TEXTAREA" || xNode.tagName == "INPUT") ? xNode.value : xNode.innerText; xGrammalectePort.postMessage({ sCommand: "getListOfTokens", dParam: {sText: sText}, dInfo: {sTextAreaId: xNode.id} }); } |
Modified gc_lang/fr/webext/manifest.json from [c2f849d8b2] to [8ca9ed57ec].
︙ | ︙ | |||
76 77 78 79 80 81 82 83 84 85 86 87 88 89 | "content_scripts/init.js" ], "run_at": "document_idle" } ], "commands": { "conjugueur_tab": { "suggested_key": { "default": "Ctrl+Shift+6" }, "description": "Ouvre le conjugueur dans un onglet" }, "conjugueur_window": { "suggested_key": { "default": "Ctrl+Shift+7" }, "description": "Ouvre le conjugueur dans une fenêtre" | > > > > > > > > > > > > | 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 | "content_scripts/init.js" ], "run_at": "document_idle" } ], "commands": { "lexicographer": { "suggested_key": { "default": "Ctrl+Shift+L" }, "description": "Ouvre le lexicographe" }, "text_formatter": { "suggested_key": { "default": "Ctrl+Shift+F" }, "description": "Ouvre le formateur de texte" }, "grammar_checker": { "suggested_key": { "default": "Ctrl+Shift+V" }, "description": "Ouvre le correcteur grammatical" }, "conjugueur_tab": { "suggested_key": { "default": "Ctrl+Shift+6" }, "description": "Ouvre le conjugueur dans un onglet" }, "conjugueur_window": { "suggested_key": { "default": "Ctrl+Shift+7" }, "description": "Ouvre le conjugueur dans une fenêtre" |
︙ | ︙ |