Grammalecte  Check-in [8f064f32f6]

Overview
Comment:[fx] use objects for communication with SharedWorker (normalization)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fx | we_sw
Files: files | file ages | folders
SHA3-256: 8f064f32f6d5cc4fac05e579c31b2f7addd651451c425a84f48d219f5ff33940
User & Date: olr on 2017-08-11 11:06:36
Other Links: branch diff | manifest | tags
Context
2017-08-11
11:18
[fx] initialize only once the grammar checker Leaf check-in: dc16695aca user: olr tags: fx, we_sw
11:06
[fx] use objects for communication with SharedWorker (normalization) check-in: 8f064f32f6 user: olr tags: fx, we_sw
07:49
[fx] fix previous commit check-in: e95b59c0d0 user: olr tags: fx, webext_sharedworker
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified gc_lang/fr/webext/background.js from [b961377700] to [fa08e42297].

︙
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
87
88
89
90
91
92

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
87

88
89
90
91
92
93
94
95








+
-
-
+
+
+
+

-
+
-

-
+

-
-
+
+

-
-
+
+
+

-
-
-
+
+
+

-
+
+
+
+



-
+








-
-
-
-

-
+
+







-
+









-
+


-
+


-
+


-
+


-
+








//let xGCEWorker = new Worker("gce_worker.js");
let xGCESharedWorker = new SharedWorker(browser.extension.getURL("gce_sharedworker.js"));
let xGCEWorker = xGCESharedWorker.port;

xGCEWorker.onmessage = function (e) {
    // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent
    try {
        let {sActionDone, result, dInfo, bError} = e.data;
        switch (e.data[0]) {
            case "grammar_errors":
        switch (sActionDone) {
            case "init":
                console.log("INIT DONE");
            case "parse":
                console.log("GRAMMAR ERRORS");
                console.log(e.data[1].aGrammErr);
                console.log(result);
                browser.runtime.sendMessage({sCommand: "grammar_errors", aGrammErr: e.data[1].aGrammErr});
                break;
            case "spelling_and_grammar_errors":
            case "parseAndSpellcheck":
                console.log("SPELLING AND GRAMMAR ERRORS");
                console.log(e.data[1].aSpellErr);
                console.log(e.data[1].aGrammErr);
                console.log(result.aSpellErr);
                console.log(result.aGrammErr);
                break;
            case "text_to_test_result":
                browser.runtime.sendMessage({sCommand: "text_to_test_result", sResult: e.data[1]});
            case "textToTest":
                console.log("TEXT TO TEXT RESULTS");
                browser.runtime.sendMessage({sCommand: "textToTest", sResult: result});
                break;
            case "fulltests_result":
                console.log("TESTS RESULTS");
                browser.runtime.sendMessage({sCommand: "fulltests_result", sResult: e.data[1]});
            case "fullTests":
                console.log("FULL TESTS RESULTS");
                browser.runtime.sendMessage({sCommand: "fullTests", sResult: result});
                break;
            case "options":
            case "getOptions":
            case "getDefaultOptions":
            case "setOptions":
            case "setOption":
                console.log("OPTIONS");
                console.log(e.data[1]);
                break;
            case "tokens":
            case "getListOfTokens":
                console.log("TOKENS");
                console.log(e.data[1]);
                let xLxgTab = browser.tabs.create({
                    url: browser.extension.getURL("panel/lexicographer.html"),
                });
                xLxgTab.then(onCreated, onError);
                break;
                break;
            case "error":
                console.log("ERROR");
                console.log(e.data[1]);
                break;
            default:
                console.log("Unknown command: " + e.data[0]);
                console.log("Unknown command: " + sActionDone);
                console.log(result);
        }
    }
    catch (e) {
        showError(e);
    }
};

xGCEWorker.postMessage(["init", {sExtensionPath: browser.extension.getURL("."), sOptions: "", sContext: "Firefox"}]);
xGCEWorker.postMessage({sCommand: "init", dParam: {sExtensionPath: browser.extension.getURL("."), sOptions: "", sContext: "Firefox"}, dInfo: {}});


/*
    Messages from the extension (not the Worker)
*/
function handleMessage (oRequest, xSender, sendResponse) {
    //console.log(xSender);
    switch(oRequest.sCommand) {
        case "parse":
            xGCEWorker.postMessage(["parse", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]);
            xGCEWorker.postMessage({sCommand: "parse", dParam: {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {}});
            break;
        case "parse_and_spellcheck":
            xGCEWorker.postMessage(["parseAndSpellcheck", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]);
            xGCEWorker.postMessage({sCommand: "parseAndSpellcheck", dParam: {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {}});
            break;
        case "get_list_of_tokens":
            xGCEWorker.postMessage(["getListOfTokens", {sText: oRequest.sText}]);
            xGCEWorker.postMessage({sCommand: "getListOfTokens", dParam: {sText: oRequest.sText}, dInfo: {}});
            break;
        case "text_to_test":
            xGCEWorker.postMessage(["textToTest", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]);
            xGCEWorker.postMessage({sCommand: "textToTest", dParam: {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {}});
            break;
        case "fulltests":
            xGCEWorker.postMessage(["fullTests"]);
            xGCEWorker.postMessage({sCommand: "fullTests", dParam: {}, dInfo: {}});
            break;
    }
    //sendResponse({response: "response from background script"});
}

browser.runtime.onMessage.addListener(handleMessage);
︙

Modified gc_lang/fr/webext/content_scripts/communicate.js from [f425809667] to [56d12bd29b].

︙
33
34
35
36
37
38
39
40

41
42
43
44
45
46
47

33
34
35
36
37
38
39

40
41
42
43
44
45
46
47








-
+









    console.log("[Iframe] [worker]");
    console.log(xGCEWorker);

    //xGCEWorker.port.start();
    //console.log("Content script [port started]");

    xGCEWorker.port.postMessage(["init", {sExtensionPath: sPath, sOptions: "", sContext: "Firefox"}]);
    xGCEWorker.port.postMessage({sCommand: "init", dParam: {sExtensionPath: sPath, sOptions: "", sContext: "Firefox"}, dInfo: {}});
    //xGCEWorker.port.postMessage(["parse", {sText: "Vas... J’en aie mare...", sCountry: "FR", bDebug: false, bContext: false}]);
    //xGCEWorker.port.postMessage(["parseAndSpellcheck", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]);
    //xGCEWorker.port.postMessage(["getListOfTokens", {sText: oRequest.sText}]);
    //xGCEWorker.port.postMessage(["textToTest", {sText: oRequest.sText, sCountry: "FR", bDebug: false, bContext: false}]);
    //xGCEWorker.port.postMessage(["fullTests"]);
}
︙

Modified gc_lang/fr/webext/content_scripts/modify_page.js from [639403006b] to [5573d033c2].

︙
11
12
13
14
15
16
17
18
19
20
21
22
23






24

25
26
27
28
29
30
31

11
12
13
14
15
16
17






18
19
20
21
22
23
24
25
26
27
28
29
30
31
32








-
-
-
-
-
-
+
+
+
+
+
+

+









/*
* Pour effectuer différent action sur la page en cours
*/
function receivedMessageFromIframe (oEvent) {
    if (typeof oEvent.data.SharedWorker !== "undefined") {
        console.log('[Web] received (from iframe (Sharedworker)):', oEvent);
        let [sCommand, answer] = oEvent.data.SharedWorker;
        console.log(sCommand);
        switch (sCommand) {
            case "grammar_errors":
                console.log(answer.aGrammErr);
                for (let oErr of answer.aGrammErr) {
        let {sActionDone, result, dInfo, bError} = oEvent.data.SharedWorker;
        console.log(sActionDone);
        switch (sActionDone) {
            case "parse":
                console.log(result);
                for (let oErr of result) {
                    console.log(oErr);
                    console.log(text.getReadableError(oErr));
                }
                break;
        }
    }    
}

/*
︙
45
46
47
48
49
50
51
52

53
54
55
56
57
58
59

46
47
48
49
50
51
52

53
54
55
56
57
58
59
60








-
+








    try {
        //La frame est chargé on envoie l'initialisation du Sharedworker
        console.log('[Web] Initialise the worker :s');
        console.log('[Web] Domaine ext: '+browser.extension.getURL(""));
        xFrameContent.postMessage({sPath: browser.extension.getURL(""), sPage: location.origin.trim("/")}, browser.extension.getURL(""));
        //Un petit test pour débogage ;)
        console.log('[Web] Test the worker :s');
        xFrameContent.postMessage(["parse", {sText: "Vas... J’en aie mare...", sCountry: "FR", bDebug: false, bContext: false}], browser.extension.getURL(""));
        xFrameContent.postMessage({sCommand: "parse", dParam: {sText: "Vas... J’en aie mare...", sCountry: "FR", bDebug: false, bContext: false}, dInfo: {}}, browser.extension.getURL(""));
    }
    catch (e) {
        console.error(e);
    }
}
document.body.appendChild(xIframe);
︙
136
137
138
139
140
141
142
143

144
145
146
147
148
149
150

151
152
153
154
155
156
157

137
138
139
140
141
142
143

144
145
146
147
148
149
150

151
152
153
154
155
156
157
158








-
+






-
+








            createTFPanel(xTextArea);
        };
        xToolbar.appendChild(xTFButton);
        let xLxgButton = document.createElement("div");
        xLxgButton.textContent = "Analyser";
        xLxgButton.style = sButtonStyle;
        xLxgButton.onclick = function() {
            createLxgPanel(xTextArea);
            console.log("Analyser");
        };
        xToolbar.appendChild(xLxgButton);
        let xGCButton = document.createElement("div");
        xGCButton.textContent = "Corriger";
        xGCButton.style = sButtonStyle;
        xGCButton.onclick = function() {
            createGCPanel(xTextArea);
            xFrameContent.postMessage({sCommand: "parse", dParam: {sText: xTextArea.value, sCountry: "FR", bDebug: false, bContext: false}, dInfo: {sInfoId: xTextArea.id}}, browser.extension.getURL(""));
        };
        xToolbar.appendChild(xGCButton);
        return xToolbar;
    }
    catch (e) {
        showError(e);
    }
︙
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196

183
184
185
186
187
188
189

190
191
192
193
194
195
196








-









function createLxgPanel (xTextArea) {
    console.log("Analyse");
}

function createGCPanel (xTextArea) {
    console.log("Correction grammaticale");
    xFrameContent.postMessage(["parse", {sText: xTextArea.value, sCountry: "FR", bDebug: false, bContext: false}], browser.extension.getURL(""));
}

function createCloseButton (xParentNode) {
    let xButton = document.createElement("div");
    xButton.style = "float: right; width: 20px; padding: 5px 10px; color: hsl(210, 0%, 100%); text-align: center;"
                  + "font-size: 20px; font-weight: bold; background-color: hsl(0, 80%, 50%); border-radius: 0 0 0 3px; cursor: pointer;";
    xButton.textContent = "×";
︙

Modified gc_lang/fr/webext/gce_sharedworker.js from [deea68b2b7] to [a479ff2c47].

︙
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
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

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

183
184


185
186
187
188
189
190
191
192
193
194
195
196
197
198

199
200
201
202
203
204
205
206
207
208


209
210
211

212
213
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
246

247
248

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
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
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
183


184
185
186
187
188


189
190
191
192
193

194
195

196
197
198
199

200
201

202
203
204
205

206
207

208
209
210
211
212
213
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
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








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+






-
+





-
-
+
+
-
-
+

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+
+












-
+
















-
+
+


-
-
+
+



-
+

-
+
+


-
+


-
+
+


-
-
+
+
+


-
-
+
+
+


-
+

-
+
+


-
+

-
+
+


-
+

-
+
+













-
+









-
+
+


-
+














-
+
+





-
+









-
+
+



-
+



/*
    Message Event Object
    https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent
*/

let xPort = null;

function createResponse (sActionDone, result, dInfo, bError=false) {
    return {
        "sActionDone": sActionDone,
        "result": result, // can be of any type
        "dInfo": dInfo,
        "bError": bError
    };
}

function createErrorResult (e, sDescr="no description") {
    return {
        "sType": "error",
        "sDescription": sDescr,
        "sMessage": e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message
    };
}

function showError (e) {
function showData (e) {
    for (let sParam in e) {
        console.log(sParam);
        console.log(e[sParam]);
    }
}

onconnect = function(e) {
onconnect = function (e) {
    console.log("START CONNECTION");
    xPort = e.ports[0];

    xPort.onmessage = function (e) {
        console.log("[Sharedworker] ONMESSAGE");
        console.log(e);
        console.log(e.data[0]);
        let {sCommand, dParam, dInfo} = e.data;
        console.log(e.data);
        let oParam = e.data[1];
        switch (e.data[0]) {
        switch (sCommand) {
            case "init":
                loadGrammarChecker(oParam.sExtensionPath, oParam.sOptions, oParam.sContext);
                init(dParam.sExtensionPath, dParam.sOptions, dParam.sContext, dInfo);
                break;
            case "parse":
                parse(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext);
                parse(dParam.sText, dParam.sCountry, dParam.bDebug, dParam.bContext, dInfo);
                break;
            case "parseAndSpellcheck":
                parseAndSpellcheck(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext);
                parseAndSpellcheck(dParam.sText, dParam.sCountry, dParam.bDebug, dParam.bContext, dInfo);
                break;
            case "getOptions":
                getOptions();
                getOptions(dInfo);
                break;
            case "getDefaultOptions":
                getDefaultOptions();
                getDefaultOptions(dInfo);
                break;
            case "setOptions":
                setOptions(oParam.sOptions);
                setOptions(dParam.sOptions, dInfo);
                break;
            case "setOption":
                setOption(oParam.sOptName, oParam.bValue);
                setOption(dParam.sOptName, dParam.bValue, dInfo);
                break;
            case "resetOptions":
                resetOptions();
                resetOptions(dInfo);
                break;
            case "textToTest":
                textToTest(oParam.sText, oParam.sCountry, oParam.bDebug, oParam.bContext);
                textToTest(dParam.sText, dParam.sCountry, dParam.bDebug, dParam.bContext, dInfo);
                break;
            case "fullTests":
                fullTests();
                fullTests('{"nbsp":true, "esp":true, "unit":true, "num":true}', dInfo);
                break;
            case "getListOfTokens":
                getListOfTokens(oParam.sText);
                getListOfTokens(dParam.sText, dInfo);
                break;
            default:
                console.log("Unknown command: " + showError(e.data[0]));
                console.log("Unknown command: " + sCommand);
                showData(e.data);
        }
    }
    //xPort.start();
}


let oDict = null;
let oTokenizer = null;
let oLxg = null;
let oTest = null;


function loadGrammarChecker (sExtensionPath, sGCOptions="", sContext="JavaScript") {
function init (sExtensionPath, sGCOptions="", sContext="JavaScript", dInfo={}) {
    try {
        console.log("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("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();
        // we always retrieve options from the gc_engine, for setOptions filters obsolete options
        xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
        //xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
        xPort.postMessage(createResponse("init", gc_engine.getOptions().gl_toString(), dInfo));
    }
    catch (e) {
        console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message);
        xPort.postMessage(["error", e.message]);
        helpers.logerror(e);
        xPort.postMessage(createResponse("init", createErrorResult(e, "init failed"), dInfo, true));
    }
}

function parse (sText, sCountry, bDebug, bContext) {
function parse (sText, sCountry, bDebug, bContext, dInfo={}) {
    let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext);
    xPort.postMessage(["grammar_errors", {aGrammErr: aGrammErr}]);
    //xPort.postMessage(["grammar_errors", {aGrammErr: aGrammErr}]);
    xPort.postMessage({sActionDone: "parse", result: aGrammErr, dInfo: dInfo});
}

function parseAndSpellcheck (sText, sCountry, bDebug, bContext) {
function parseAndSpellcheck (sText, sCountry, bDebug, bContext, dInfo={}) {
    let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext);
    let aSpellErr = oTokenizer.getSpellingErrors(sText, oDict);
    xPort.postMessage(["spelling_and_grammar_errors", {aGrammErr: aGrammErr, aSpellErr: aSpellErr}]);
    //xPort.postMessage(["spelling_and_grammar_errors", {aGrammErr: aGrammErr, aSpellErr: aSpellErr}]);
    xPort.postMessage(createResponse("parseAndSpellcheck", {aGrammErr: aGrammErr, aSpellErr: aSpellErr}, dInfo));
}

function getOptions () {
    xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
function getOptions (dInfo={}) {
    //xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    xPort.postMessage(createResponse("getOptions", gc_engine.getOptions().gl_toString(), dInfo));
}

function getDefaultOptions () {
    xPort.postMessage(["options", gc_engine.getDefaultOptions().gl_toString()]);
function getDefaultOptions (dInfo={}) {
    //xPort.postMessage(["options", gc_engine.getDefaultOptions().gl_toString()]);
    xPort.postMessage(createResponse("getDefaultOptions", gc_engine.getDefaultOptions().gl_toString(), dInfo));
}

function setOptions (sGCOptions) {
function setOptions (sGCOptions, dInfo={}) {
    gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions)));
    xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    //xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    xPort.postMessage(createResponse("setOptions", gc_engine.getOptions().gl_toString(), dInfo));
}

function setOption (sOptName, bValue) {
function setOption (sOptName, bValue, dInfo={}) {
    gc_engine.setOptions(new Map([ [sOptName, bValue] ]));
    xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    //xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    xPort.postMessage(createResponse("setOption", gc_engine.getOptions().gl_toString(), dInfo));
}

function resetOptions () {
function resetOptions (dInfo={}) {
    gc_engine.resetOptions();
    xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    //xPort.postMessage(["options", gc_engine.getOptions().gl_toString()]);
    xPort.postMessage(createResponse("resetOptions", gc_engine.getOptions().gl_toString(), dInfo));
}

function tests () {
    console.log(conj.getConj("devenir", ":E", ":2s"));
    console.log(mfsp.getMasForm("emmerdeuse", true));
    console.log(mfsp.getMasForm("pointilleuse", false));
    console.log(phonet.getSimil("est"));
    let aRes = gc_engine.parse("Je suit...");
    for (let oErr of aRes) {
        console.log(text.getReadableError(oErr));
    }
}

function textToTest (sText, sCountry, bDebug, bContext) {
function textToTest (sText, sCountry, bDebug, bContext, dInfo={}) {
    if (!gc_engine || !oDict) {
        xPort.postMessage(["error", "# Error: grammar checker or dictionary not loaded."]);
        return;
    }
    let aGrammErr = gc_engine.parse(sText, sCountry, bDebug, bContext);
    let sMsg = "";
    for (let oErr of aGrammErr) {
        sMsg += text.getReadableError(oErr) + "\n";
    }
    xPort.postMessage(["text_to_test_result", sMsg]);
    //xPort.postMessage(["text_to_test_result", sMsg]);
    xPort.postMessage(createResponse("textToTest", sMsg, dInfo));
}

function fullTests (sGCOptions='{"nbsp":true, "esp":true, "unit":true, "num":true}') {
function fullTests (sGCOptions="", dInfo={}) {
    if (!gc_engine || !oDict) {
        xPort.postMessage(["error", "# Error: grammar checker or dictionary not loaded."]);
        return;
    }
    let dMemoOptions = gc_engine.getOptions();
    if (sGCOptions) {
        gc_engine.setOptions(helpers.objectToMap(JSON.parse(sGCOptions)));
    }
    let sMsg = "";
    for (let sRes of oTest.testParse()) {
        sMsg += sRes + "\n";
        console.log(sRes);
    }
    gc_engine.setOptions(dMemoOptions);
    xPort.postMessage(["fulltests_result", sMsg]);
    //xPort.postMessage(["fulltests_result", sMsg]);
    xPort.postMessage(createResponse("fullTests", sMsg, dInfo));
}


// Lexicographer

function getListOfTokens (sText) {
function getListOfTokens (sText, dInfo={}) {
    try {
        let aElem = [];
        let aRes = null;
        for (let oToken of oTokenizer.genTokens(sText)) {
            aRes = oLxg.getInfoForToken(oToken);
            if (aRes) {
                aElem.push(aRes);
            }
        }
        xPort.postMessage(["tokens", aElem]);
        //xPort.postMessage(["tokens", aElem]);
        xPort.postMessage(createResponse("getListOfTokens", aElem, dInfo));
    }
    catch (e) {
        helpers.logerror(e);
        xPort.postMessage(["error", e.message]);
        xPort.postMessage(createResponse("getListOfTokens", createErrorResult(e, "no tokens"), dInfo, true));
    }
}

Modified gc_lang/fr/webext/manifest.json from [a125616a8e] to [c15e1717eb].

︙
32
33
34
35
36
37
38
39

40
41
42
43
44
45
46

32
33
34
35
36
37
38

39
40
41
42
43
44
45
46








-
+








    "scripts": [
      "background.js"
    ]
  },
  "content_scripts": [
    {
      "matches": ["*://*/*"],
      "js": ["content_scripts/modify_page.js"]
      "js": ["content_scripts/modify_page.js", "grammalecte/text.js"]
    }
  ],
  "web_accessible_resources": [
    "grammalecte/_dictionaries/French.json",
    "grammalecte/fr/conj_data.json",
    "grammalecte/fr/mfsp_data.json",
    "grammalecte/fr/phonet_data.json",
︙

Modified gc_lang/fr/webext/panel/main.js from [2915144b90] to [43657f7f5c].

︙
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

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








+





-
+
+


-
+
+


+
+
+










/*
    Messages received
*/
function handleMessage (oMessage, xSender, sendResponse) {
    console.log(xSender);
    console.log(oMessage.sCommand);
    switch(oMessage.sCommand) {
        case "show_tokens":
            console.log("show tokens");
            addParagraphOfTokens(oMessage.oResult);
            break;
        case "text_to_test_result":
        case "textToTest":
            console.log(oMessage.sResult);
            showTestResult(oMessage.sResult);
            break;
        case "fulltests_result":
        case "fullTests":
            console.log(oMessage.sResult);
            showTestResult(oMessage.sResult);
            break;
        default:
            console.log("Unknow command: " + oMessage.sCommand);

    }
    sendResponse({sCommand: "none", sResult: "done"});
}

browser.runtime.onMessage.addListener(handleMessage);
︙

Fossil 2.20 [210e89a059] 2022-11-16 18:46:32
This page was generated in about 0.006s