Overview
Comment: | [fx] grammar checking: first attempt (it’s a beginning) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | fx | webext2 |
Files: | files | file ages | folders |
SHA3-256: |
cb6718897572c0b18fa15ed7d5357398 |
User & Date: | olr on 2017-08-15 10:27:07 |
Other Links: | branch diff | manifest | tags |
Context
2017-08-15
| ||
11:47 | [fx] CSS update, split CSS in different files check-in: 7eec389765 user: olr tags: fx, webext2 | |
10:27 | [fx] grammar checking: first attempt (it’s a beginning) check-in: cb67188975 user: olr tags: fx, webext2 | |
08:57 | [fx] CSS: thinner borders for the panel + adjustments for the lexicographer check-in: a949a0b41c user: olr tags: fx, webext2 | |
Changes
Modified gc_lang/fr/webext/content_scripts/content_modifier.js from [84cf5b1b92] to [4dca30bd26].
︙ | ︙ | |||
54 55 56 57 58 59 60 | let xToolbar = createNode("div", {className: "grammalecte_wrapper_toolbar"}); let xConjButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Conjuguer"}); xConjButton.onclick = function() { createConjPanel(); }; let xTFButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Formater"}); xTFButton.onclick = function() { createTFPanel(xTextArea); }; let xLxgButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Analyser"}); xLxgButton.onclick = function() { | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | let xToolbar = createNode("div", {className: "grammalecte_wrapper_toolbar"}); let xConjButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Conjuguer"}); xConjButton.onclick = function() { createConjPanel(); }; let xTFButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Formater"}); xTFButton.onclick = function() { createTFPanel(xTextArea); }; let xLxgButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Analyser"}); xLxgButton.onclick = function() { createLxgPanel(); xPort.postMessage({sCommand: "getListOfTokens", dParam: {sText: xTextArea.value}, dInfo: {sTextAreaId: xTextArea.id}}); }; let xGCButton = createNode("div", {className: "grammalecte_wrapper_button", textContent: "Corriger"}); xGCButton.onclick = function() { createGCPanel(); xPort.postMessage({sCommand: "parseAndSpellcheck", dParam: {sText: xTextArea.value, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {sTextAreaId: xTextArea.id}}); }; |
︙ | ︙ | |||
102 103 104 105 106 107 108 | oTFPanel = new GrammalectePanel("grammalecte_tf_panel", "Formateur de texte", 800, 600, false); oTFPanel.logInnerHTML(); oTFPanel.setContentNode(createTextFormatter(xTextArea)); oTFPanel.insertIntoPage(); } } | | > < < < < | 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 | oTFPanel = new GrammalectePanel("grammalecte_tf_panel", "Formateur de texte", 800, 600, false); oTFPanel.logInnerHTML(); oTFPanel.setContentNode(createTextFormatter(xTextArea)); oTFPanel.insertIntoPage(); } } function createLxgPanel () { console.log("Lexicographe"); if (oLxgPanel !== null) { oLxgPanelContent.clear(); oLxgPanel.show(); } else { // create the panel oLxgPanel = new GrammalectePanel("grammalecte_lxg_panel", "Lexicographe", 500, 700); oLxgPanel.setContentNode(oLxgPanelContent.getNode()); oLxgPanel.insertIntoPage(); } } function createGCPanel () { console.log("Correction grammaticale"); if (oGCPanel !== null) { oGCPanelContent.clear(); oGCPanel.show(); } else { // create the panel oGCPanel = new GrammalectePanel("grammalecte_gc_panel", "Correcteur", 500, 700); oGCPanel.setContentNode(oGCPanelContent.getNode()); oGCPanel.insertIntoPage(); } } /* Simple message */ function handleMessage (oMessage, xSender, sendResponse) { console.log("[Content script] received:"); console.log(oMessage); |
︙ | ︙ | |||
160 161 162 163 164 165 166 | switch (sActionDone) { case "getCurrentTabId": console.log("[Content script] tab id: " + result); nTadId = result; break; case "parseAndSpellcheck": console.log(result); | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | switch (sActionDone) { case "getCurrentTabId": console.log("[Content script] tab id: " + result); nTadId = result; break; case "parseAndSpellcheck": console.log(result); oGCPanelContent.addParagraphResult(result); break; case "getListOfTokens": console.log(result); oLxgPanelContent.addListOfTokens(result); break; default: console.log("[Content script] Unknown command: " + sActionDone); |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/gc_content.js from [1881b88610] to [27a797448e].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | // JavaScript "use strict"; const oGCPanelContent = { _xContentNode: createNode("div", {id: "grammalecte_gc_panel_content"}), getNode: function () { return this._xContentNode; }, clear: function () { while (this._xContentNode.firstChild) { this._xContentNode.removeChild(this._xContentNode.firstChild); } }, | > > | > | | | | | | | | | | | | | | | > > > > > > > > > > > > > < < < < < < < < < < < | < | | | 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 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 | // JavaScript "use strict"; const oGCPanelContent = { _xContentNode: createNode("div", {id: "grammalecte_gc_panel_content"}), aIgnoredErrors: new Map(), getNode: function () { return this._xContentNode; }, clear: function () { while (this._xContentNode.firstChild) { this._xContentNode.removeChild(this._xContentNode.firstChild); } }, addParagraphResult: function (oResult) { try { if (oResult) { let xNodeDiv = createNode("div", {className: "grammalecte_paragraph_block"}); // actions let xActionsBar = createNode("div", {className: "grammalecte_paragraph_actions"}); let xCloseButton = createNode("div", {id: "end" + oResult.sParaNum, className: "grammalecte_paragraph_close_button", textContent: "×"}); let xAnalyseButton = createNode("div", {id: "check" + oResult.sParaNum, className: "grammalecte_paragraph_analyse_button", textContent: "Réanalyser"}); xActionsBar.appendChild(xAnalyseButton); xActionsBar.appendChild(xCloseButton); // paragraph let xParagraph = createNode("p", {id: "paragr"+oResult.sParaNum, lang: "fr", spellcheck: "false", contenteditable: "true"}); xParagraph.className = (oResult.aGrammErr.length || oResult.aSpellErr.length) ? "grammalecte_paragraph softred" : "grammalecte_paragraph"; this._tagParagraph(xParagraph, oResult.sParagraph, oResult.sParaNum, oResult.aGrammErr, oResult.aSpellErr); // creation xNodeDiv.appendChild(xActionsBar); xNodeDiv.appendChild(xParagraph); this._xContentNode.appendChild(xNodeDiv); } } catch (e) { showError(e); } }, refreshParagraph: function (oResult) { try { let xParagraph = document.getElementById("paragr"+sIdParagr); xParagraph.className = (oResult.aGrammErr.length || oResult.aSpellErr.length) ? "grammalecte_paragraph softred" : "grammalecte_paragraph"; xParagraph.textContent = ""; this._tagParagraph(xParagraph, oResult.sParagraph, oResult.sParaNum, oResult.aGrammErr, oResult.aSpellErr); } catch (e) { showError(e); } }, _tagParagraph: function (xParagraph, sParagraph, sParaNum, aSpellErr, aGrammErr) { try { if (aGrammErr.length === 0 && aSpellErr.length === 0) { xParagraph.textContent = sParagraph; return } aGrammErr.push(...aSpellErr); aGrammErr.sort(function (a, b) { if (a["nStart"] < b["nStart"]) return -1; if (a["nStart"] > b["nStart"]) return 1; return 0; }); let nErr = 0; // we count errors to give them an identifier let nEndLastErr = 0; for (let oErr of aGrammErr) { let nStart = oErr["nStart"]; let nEnd = oErr["nEnd"]; if (nStart >= nEndLastErr) { oErr['sErrorId'] = sParaNum + "_" + nErr.toString(); // error identifier oErr['sIgnoredKey'] = sParaNum + ":" + nStart.toString() + ":" + nEnd.toString() + ":" + sParagraph.slice(nStart, nEnd); if (nEndLastErr < nStart) { xParagraph.appendChild(document.createTextNode(sParagraph.slice(nEndLastErr, nStart))); } xParagraph.appendChild(this._createError(sParagraph.slice(nStart, nEnd), oErr)); xParagraph.insertAdjacentHTML("beforeend", "<!-- err_end -->"); nEndLastErr = nEnd; } |
︙ | ︙ | |||
103 104 105 106 107 108 109 | xNodeErr.dataset.gc_url = oErr['URL']; if (xNodeErr.dataset.gc_message.includes(" #")) { xNodeErr.dataset.line_id = oErr['sLineId']; xNodeErr.dataset.rule_id = oErr['sRuleId']; } xNodeErr.dataset.suggestions = oErr["aSuggestions"].join("|"); } | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | xNodeErr.dataset.gc_url = oErr['URL']; if (xNodeErr.dataset.gc_message.includes(" #")) { xNodeErr.dataset.line_id = oErr['sLineId']; xNodeErr.dataset.rule_id = oErr['sRuleId']; } xNodeErr.dataset.suggestions = oErr["aSuggestions"].join("|"); } xNodeErr.className = (this.aIgnoredErrors.has(xNodeErr.dataset.ignored_key)) ? "ignored" : "error " + oErr['sType']; return xNodeErr; }, applySuggestion: function (sSuggId) { // sugg try { let sErrorId = document.getElementById(sSuggId).dataset.error_id; let sIdParagr = sErrorId.slice(0, sErrorId.indexOf("_")); |
︙ | ︙ | |||
129 130 131 132 133 134 135 | } }, ignoreError: function (sIgnoreButtonId) { // ignore try { //console.log("ignore button: " + sIgnoreButtonId + " // error id: " + document.getElementById(sIgnoreButtonId).dataset.error_id); let xNodeErr = document.getElementById("err"+document.getElementById(sIgnoreButtonId).dataset.error_id); | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | } }, ignoreError: function (sIgnoreButtonId) { // ignore try { //console.log("ignore button: " + sIgnoreButtonId + " // error id: " + document.getElementById(sIgnoreButtonId).dataset.error_id); let xNodeErr = document.getElementById("err"+document.getElementById(sIgnoreButtonId).dataset.error_id); this.aIgnoredErrors.add(xNodeErr.dataset.ignored_key); xNodeErr.className = "ignored"; xNodeErr.removeAttribute("style"); this.hideAllTooltips(); } catch (e) { showError(e); } |
︙ | ︙ |
Modified gc_lang/fr/webext/content_scripts/panel_creator.js from [38b104911b] to [bfbf51c76e].
︙ | ︙ | |||
10 11 12 13 14 15 16 | constructor (sId, sTitle, nWidth, nHeight, bMovable=true) { this.sId = sId; this.sContentId = sId+"_content"; this.nWidth = nWidth; this.nHeight = nHeight; this.bMovable = bMovable; | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | constructor (sId, sTitle, nWidth, nHeight, bMovable=true) { this.sId = sId; this.sContentId = sId+"_content"; this.nWidth = nWidth; this.nHeight = nHeight; this.bMovable = bMovable; this.xContentNode = createNode("div", {className: "grammalecte_panel_content"}); this.xPanelNode = this._createPanel(sTitle); this.center(); } _createPanel (sTitle) { try { let xPanel = createNode("div", {id: this.sId, className: "grammalecte_panel"}); |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_worker.js from [6354516b05] to [faebfd8747].
︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | let bInitDone = false; let oDict = null; let oTokenizer = null; let oLxg = null; let oTest = null; function init (sExtensionPath, sGCOptions="", sContext="JavaScript", dInfo={}) { 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…"); gc_engine.load(sContext, sExtensionPath+"grammalecte/_dictionaries"); oDict = gc_engine.getDictionary(); oTest = new TestGrammarChecking(gc_engine, sExtensionPath+"/grammalecte/fr/tests_data.json"); oLxg = new Lexicographe(oDict); if (sGCOptions !== "") { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); } oTokenizer = new Tokenizer("fr"); | > > > > > > > > > | > | | > > > > | | > > > | | 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 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | let bInitDone = false; let oDict = null; let oTokenizer = null; let oLxg = null; let oTest = null; /* Technical note: 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, sGCOptions="", sContext="JavaScript", dInfo={}) { 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…"); gc_engine.load(sContext, sExtensionPath+"grammalecte/_dictionaries"); oDict = gc_engine.getDictionary(); oTest = new TestGrammarChecking(gc_engine, sExtensionPath+"/grammalecte/fr/tests_data.json"); oLxg = new Lexicographe(oDict); if (sGCOptions !== "") { gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions))); } oTokenizer = new Tokenizer("fr"); //tests(); bInitDone = true; } else { console.log("[Worker] Already initialized…") } // we always retrieve options from the gc_engine, for setOptions filters obsolete options postMessage(createResponse("init", gc_engine.getOptions().gl_toString(), dInfo, true)); } catch (e) { helpers.logerror(e); postMessage(createResponse("init", createErrorResult(e, "init failed"), dInfo, true, true)); } } function parse (sText, sCountry, bDebug, bContext, dInfo={}) { for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, bContext); postMessage(createResponse("parse", aGrammErr, dInfo, false)); } postMessage(createResponse("parse", null, dInfo, true)); } function parseAndSpellcheck (sText, sCountry, bDebug, bContext, dInfo={}) { let n = 0; for (let sParagraph of text.getParagraph(sText)) { let aGrammErr = gc_engine.parse(sParagraph, sCountry, bDebug, bContext); let aSpellErr = oTokenizer.getSpellingErrors(sParagraph, oDict); n += 1; postMessage(createResponse("parseAndSpellcheck", {sParagraph: sParagraph, sParaNum: n.toString(), aGrammErr: aGrammErr, aSpellErr: aSpellErr}, dInfo, false)); } postMessage(createResponse("parseAndSpellcheck", null, dInfo, true)); } function getOptions (dInfo={}) { postMessage(createResponse("getOptions", gc_engine.getOptions().gl_toString(), dInfo, true)); } function getDefaultOptions (dInfo={}) { |
︙ | ︙ |