Overview
| Comment: | [fx] gc panel: fix conjugueur |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk | fx |
| Files: | files | file ages | folders |
| SHA3-256: |
385da73cc1f1da9ec60eaa4e0973cdcd |
| User & Date: | olr on 2019-05-08 08:32:03 |
| Other Links: | manifest | tags |
Context
|
2019-05-08
| ||
| 11:26 | [fx] gc panel: prevent switching tabs when working, to avoid overload check-in: 4622bc10d8 user: olr tags: trunk, fx | |
| 08:32 | [fx] gc panel: fix conjugueur check-in: 385da73cc1 user: olr tags: trunk, fx | |
|
2019-05-07
| ||
| 20:04 | [fx] gc panel: ajustements check-in: 8058c7ee7c user: olr tags: trunk, fx | |
Changes
Modified gc_lang/fr/webext/content_scripts/init.js from [7c92c88614] to [fe7209c432].
| ︙ | ︙ | |||
308 309 310 311 312 313 314 |
oGrammalecte.oGCPanel.stopWaitIcon();
}
break;
case "getSpellSuggestions":
oGrammalecte.oGCPanel.oTooltip.setSpellSuggestionsFor(result.sWord, result.aSugg, result.iSuggBlock, dInfo.sErrorId);
break;
case "getVerb":
| > | > > > | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 |
oGrammalecte.oGCPanel.stopWaitIcon();
}
break;
case "getSpellSuggestions":
oGrammalecte.oGCPanel.oTooltip.setSpellSuggestionsFor(result.sWord, result.aSugg, result.iSuggBlock, dInfo.sErrorId);
break;
case "getVerb":
if (dInfo.bStart) {
oGrammalecte.oGCPanel.conjugateWith(result.oVerb, result.oConjTable);
} else {
oGrammalecte.oGCPanel.displayConj(result.oConjTable);
}
break;
/*
Commands received from the context menu
(Context menu are initialized in background)
*/
// Grammar checker commands
case "grammar_checker_editable":
|
| ︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_gc.js from [96169a3c96] to [f6257cdef8].
| ︙ | ︙ | |||
534 535 536 537 538 539 540 |
}
if (sVerb.endsWith("?")) {
this.xParent.getElementById('grammalecte_conj_oint').checked = true;
sVerb = sVerb.slice(0,-1).trim();
}
if (sVerb) {
this.sVerb = sVerb;
| | | | | 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 |
}
if (sVerb.endsWith("?")) {
this.xParent.getElementById('grammalecte_conj_oint').checked = true;
sVerb = sVerb.slice(0,-1).trim();
}
if (sVerb) {
this.sVerb = sVerb;
this.updateConj(true);
} else {
this.xParent.getElementById('grammalecte_conj_verb').value = "";
}
}
}
catch (e) {
console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message);
}
}
updateConj (bStart=false) {
let bPro = this.xParent.getElementById('grammalecte_conj_opro').checked;
let bNeg = this.xParent.getElementById('grammalecte_conj_oneg').checked;
let bTpsCo = this.xParent.getElementById('grammalecte_conj_otco').checked;
let bInt = this.xParent.getElementById('grammalecte_conj_oint').checked;
let bFem = this.xParent.getElementById('grammalecte_conj_ofem').checked;
if (this.sVerb) {
xGrammalectePort.postMessage({
sCommand: "getVerb",
dParam: {sVerb: this.sVerb, bPro: bPro, bNeg: bNeg, bTpsCo: bTpsCo, bInt: bInt, bFem: bFem},
dInfo: {bStart: bStart}
});
}
}
conjugateWith (oVerb, oConjTable) {
// function called when results come from the Worker
if (oVerb) {
|
| ︙ | ︙ | |||
594 595 596 597 598 599 600 |
} else { // -1 or 1 or error
this.xParent.getElementById('grammalecte_conj_opro').checked = false;
this.xParent.getElementById('grammalecte_conj_opro').disabled = true;
this.xParent.getElementById('grammalecte_conj_opro_lbl').style.color = "#CCC";
}
this.xParent.getElementById('grammalecte_conj_note').textContent = "❦";
}
| | | > | 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 |
} else { // -1 or 1 or error
this.xParent.getElementById('grammalecte_conj_opro').checked = false;
this.xParent.getElementById('grammalecte_conj_opro').disabled = true;
this.xParent.getElementById('grammalecte_conj_opro_lbl').style.color = "#CCC";
}
this.xParent.getElementById('grammalecte_conj_note').textContent = "❦";
}
this.displayConj(oConjTable);
} else {
this.xParent.getElementById('grammalecte_conj_verb').style.color = "#BB4411";
}
}
displayConj (oConjTable) {
// function called when results come from the Worker
if (oConjTable === null) {
return;
}
try {
this.xParent.getElementById('grammalecte_conj_verb').Text = "";
// infinitif
this.xParent.getElementById('grammalecte_conj_infi').textContent = oConjTable["infi"] || " "; // something or nbsp
|
| ︙ | ︙ |