Changes In Branch webext_sharedworker Through [19934834b3] Excluding Merge-Ins
This is equivalent to a diff from 08f0167b9e to 19934834b3
2017-08-11
| ||
07:49 | [fx] fix previous commit check-in: e95b59c0d0 user: olr tags: fx, webext_sharedworker | |
07:35 | [fx] commited by mistake (not working) check-in: 19934834b3 user: olr tags: fx, webext_sharedworker | |
07:15 | [fx] rename communicate check-in: cd64de6f5a user: olr tags: fx, webext_sharedworker | |
2017-08-10
| ||
14:08 | Create new branch named "webext_sharedworker" check-in: 976290fcbe user: IllusionPerdu tags: webext_sharedworker | |
09:59 | [fx] content-script interface + remove SharedWorker check-in: e026bff1c5 user: olr tags: fx, webext2 | |
2017-08-09
| ||
19:33 | [fx] Correct the intialisation of the SharedWorker check-in: 08f0167b9e user: IllusionPerdu tags: fx, webext2 | |
18:11 | [fx] SharedWorker attempt (not working in content script) + lexicographer panel check-in: 4e34f03093 user: olr tags: fx, webext2 | |
Modified gc_lang/fr/webext/background.js from [eb2f1b3278] to [b961377700].
1 2 3 4 5 6 7 8 9 10 11 | // Background "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } /* Worker (separate thread to avoid freezing Firefox) */ | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | // Background "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } /* Worker (separate thread to avoid freezing Firefox) */ //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 { switch (e.data[0]) { case "grammar_errors": console.log("GRAMMAR ERRORS"); |
︙ | ︙ | |||
174 175 176 177 178 179 180 | type: 'panel', url: browser.extension.getURL("panel/conjugueur.html"), top: top, left: left, width: width, height: height, }); browser.windows.update(xWin.id, { top:top, left:left, }); // firefox currently ignores top and left in .create(), so move it here console.log("Async done"); } //newwin(); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 176 177 178 179 180 181 182 | type: 'panel', url: browser.extension.getURL("panel/conjugueur.html"), top: top, left: left, width: width, height: height, }); browser.windows.update(xWin.id, { top:top, left:left, }); // firefox currently ignores top and left in .create(), so move it here console.log("Async done"); } //newwin(); |
Added gc_lang/fr/webext/content_scripts/communicate.html version [2013884bde].
> > > > > > | 1 2 3 4 5 6 | <html> <head> <script src="/content_scripts/communicate.js"></script> </head> <body></body> </html> |
Added gc_lang/fr/webext/content_scripts/communicate.js version [f425809667].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | let xGCEWorker = null; console.log('[Iframe] Loaded'); /* Worker (separate thread to avoid freezing Firefox) */ function createSharedWorker (sPath) { try { xGCEWorker = new SharedWorker(sPath+"gce_sharedworker.js"); } catch (e) { console.error(e); } xGCEWorker.onerror = function(e) { console.log('There is an error with your worker!'); console.log(typeof(e)); console.log(e); } xGCEWorker.port.onmessage = function (e) { // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent try { // On retransmet directement le message à la page console.log("[Iframe] send from Message Worker"); window.postMessage({SharedWorker: e.data}, sPath); } catch (e) { console.error(e); } }; 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(["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"]); } var sPathOrigin = ''; console.log('[Iframe] Set receivedMessageWeb'); function receivedMessageWeb (oEvent) { // Pour être sûr que ça vient bien de notre iframe ;) if (!xGCEWorker && typeof oEvent.data.sPath !== "undefined" && typeof oEvent.data.sPage !== "undefined" && oEvent.data.sPage === oEvent.origin) { console.log('[Iframe] Create the Sharedworker ', oEvent.origin); sPathOrigin = oEvent.origin; createSharedWorker(oEvent.data.sPath); } else if (xGCEWorker && sPathOrigin === oEvent.origin && typeof oEvent.data.SharedWorker === "undefined") { console.log('[Iframe] received (no SharedWorker):', oEvent, oEvent.origin); // Les messages reçus maintenant ont un SharedWorker fonctionnel // On transmet au SharedWorker uniquement si ça vient de la page web et on s’assure que ce n’est pas une réponse du SharedWorker. // TODO: Établir un protocole de communication afin de traiter uniquement les messages utiles console.log('[Iframe] exec command with SharedWorker'); xGCEWorker.port.postMessage(oEvent.data); console.log('[Iframe] end send message to worker'); } } window.addEventListener("message", receivedMessageWeb, false); console.log('[Iframe] END'); |
Modified gc_lang/fr/webext/content_scripts/modify_page.js from [a5f9d0af95] to [2505acbc2a].
1 2 3 4 | // Modify page "use strict"; | < > > < > < | | | > | > > | | < | | > | > > > > > > > > > > > > > > > > > > > > > > > > > | < < < | | > > > | | > > > | > > > | > > > > > | | | | > > > > | | | | > | > > | < > > > > > > > > > > > > > | | > > | | > | | | > > > > | | | > > | > > > > > > | > | > > > | < < > > > > > > | > > > > > > | < < | > > < | < < < > | | > > > | | | > > > > | < < < < < | < < < < | > > | < < < < < < | < < | < < > > | | > > > > > > > | | < < < | 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 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 | // Modify page "use strict"; function showError (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } console.log("Content script [start]"); /* * 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) { console.log(oErr); } break; } } } /* * Creation d'une iframe pour communiquer entre la page visitée et le Shareworker */ var sFrameID = browser.extension.getURL("").split('/')[2]; var xIframe = document.createElement('iframe'); let xFrameContent = null; xIframe.id = sFrameID; xIframe.src = browser.extension.getURL('content_scripts/communicate.html'); xIframe.hidden = true; xIframe.onload= function () { console.log('[Web] Init protocol de communication'); //var xFrameContent = xIframe.contentWindow; xFrameContent = document.getElementById(sFrameID).contentWindow; xFrameContent.addEventListener("message", receivedMessageFromIframe, false); 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("")); } catch (e) { console.error(e); } } document.body.appendChild(xIframe); function loadImage (sContainerClass, sImagePath) { let xRequest; xRequest = new XMLHttpRequest(); xRequest.open('GET', browser.extension.getURL("")+sImagePath, false); xRequest.responseType = "arraybuffer"; xRequest.send(); let blobTxt = new Blob([xRequest.response], {type: 'image/png'}); let img = document.createElement('img'); img.src = (URL || webkitURL).createObjectURL(blobTxt); Array.filter(document.getElementsByClassName(sContainerClass), function (oElem) { oElem.appendChild(img); }); } console.log('[Web] La suite des initialisations'); let nWrapper = 0; let xConjPanel = null; let xTFPanel = null; let xLxgPanel = null; let xGCPanel = null; function wrapTextareas () { let lNode = document.getElementsByTagName("textarea"); for (let xNode of lNode) { createWrapper(xNode); } } function createWrapper (xTextArea) { try { let xParentElement = xTextArea.parentElement; let xWrapper = document.createElement("div"); xWrapper.style = "padding: 5px; color: hsl(210, 10%, 90%); background-color: hsl(210, 50%, 50%); border-radius: 3px;"; xWrapper.id = nWrapper + 1; nWrapper += 1; xParentElement.insertBefore(xWrapper, xTextArea); xWrapper.appendChild(xTextArea); // move textarea in wrapper let xToolbar = createWrapperToolbar(xTextArea); xWrapper.appendChild(xToolbar); loadImage("GrammalecteTitle", "img/logo-16.png"); } catch (e) { showError(e); } } let sButtonStyle = "display: inline-block; padding: 0 5px; margin-left: 5px; background-color: hsl(210, 50%, 60%); border-radius: 2px; cursor: pointer;"; function createWrapperToolbar (xTextArea) { try { let xToolbar = document.createElement("div"); xToolbar.style = "display: flex; justify-content: flex-end; margin-top: 5px; padding: 5px 10px;"; /*let xLogo = document.createElement("img"); xLogo.src = browser.extension.getURL("img/logo-16.png"); xTitle.appendChild(xLogo);*/ let xImage = document.createElement("span"); xImage.className = "GrammalecteTitle"; xToolbar.appendChild(xImage); xToolbar.appendChild(document.createTextNode("Grammalecte")); let xConjButton = document.createElement("div"); xConjButton.textContent = "Conjuguer"; xConjButton.style = sButtonStyle; xConjButton.onclick = function() { createConjPanel(); }; xToolbar.appendChild(xConjButton); let xTFButton = document.createElement("div"); xTFButton.textContent = "Formater"; xTFButton.style = sButtonStyle; xTFButton.onclick = function(xTextArea) { createTFPanel(); }; xToolbar.appendChild(xTFButton); let xLxgButton = document.createElement("div"); xLxgButton.textContent = "Analyser"; xLxgButton.style = sButtonStyle; xLxgButton.onclick = function(xTextArea) { createLxgPanel(); }; xToolbar.appendChild(xLxgButton); let xGCButton = document.createElement("div"); xGCButton.textContent = "Corriger"; xGCButton.style = sButtonStyle; xGCButton.onclick = function(xTextArea) { createGCPanel(); }; xToolbar.appendChild(xGCButton); return xToolbar; } catch (e) { showError(e); } } function createConjPanel () { console.log("Conjugueur"); if (xConjPanel !== null) { xConjPanel.style.display = "block"; } else { // create the panel xConjPanel = document.createElement("div"); xConjPanel.style = "position: fixed; left: 50%; top: 50%; z-index: 100; height: 400px; margin-top: -200px; width: 600px; margin-left: -300px; border-radius: 10px;" + " color: hsl(210, 10%, 4%); background-color: hsl(210, 20%, 90%); border: 10px solid hsla(210, 20%, 70%, .5);"; xConjPanel.textContent = "Conjugueur"; xConjPanel.setAttribute("draggable", true); xConjPanel.appendChild(createCloseButton(xConjPanel)); document.body.appendChild(xConjPanel); } } function createTFPanel (xTextArea) { console.log("Formateur de texte"); } 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 = "×"; xButton.onclick = function () { xParentNode.style.display = "none"; } return xButton; } /* Assign do_something() as a listener for messages from the extension. */ |
︙ | ︙ |
Modified gc_lang/fr/webext/gce_sharedworker.js from [9a703895dc] to [deea68b2b7].
︙ | ︙ | |||
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ let xPort = null; onconnect = function(e) { console.log("START CONNECTION"); xPort = e.ports[0]; xPort.onmessage = function (e) { console.log(e); console.log(e.data[0]); let oParam = e.data[1]; switch (e.data[0]) { case "init": loadGrammarChecker(oParam.sExtensionPath, oParam.sOptions, oParam.sContext); break; | > > > > > > > > | 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 | /* Message Event Object https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent */ let xPort = null; function showError (e) { for (let sParam in e) { console.log(sParam); console.log(e[sParam]); } } 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 oParam = e.data[1]; switch (e.data[0]) { case "init": loadGrammarChecker(oParam.sExtensionPath, oParam.sOptions, oParam.sContext); break; |
︙ | ︙ | |||
100 101 102 103 104 105 106 | case "fullTests": fullTests(); break; case "getListOfTokens": getListOfTokens(oParam.sText); break; default: | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | case "fullTests": fullTests(); break; case "getListOfTokens": getListOfTokens(oParam.sText); break; default: console.log("Unknown command: " + showError(e.data[0])); } } //xPort.start(); } let oDict = null; |
︙ | ︙ | |||
128 129 130 131 132 133 134 | 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"); | | | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | 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()]); } catch (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); xPort.postMessage(["error", e.message]); } |
︙ | ︙ |
Modified gc_lang/fr/webext/manifest.json from [1400a7a766] to [a125616a8e].
︙ | ︙ | |||
40 41 42 43 44 45 46 | } ], "web_accessible_resources": [ "grammalecte/_dictionaries/French.json", "grammalecte/fr/conj_data.json", "grammalecte/fr/mfsp_data.json", "grammalecte/fr/phonet_data.json", | | > > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | } ], "web_accessible_resources": [ "grammalecte/_dictionaries/French.json", "grammalecte/fr/conj_data.json", "grammalecte/fr/mfsp_data.json", "grammalecte/fr/phonet_data.json", "grammalecte/fr/tests_data.json", "content_scripts/communicate.html", "content_scripts/communicate.js", "img/logo-16.png" ], "permissions": [ "activeTab", "contextMenus" ], "chrome_settings_overrides": { "search_provider": { |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/main.html from [152e200e98] to [e9d159efe3].
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | </div> --> <div id="page"> <section id="home_page" class="page"> <h1>GRAMMALECTE</h1> </section> <section id="gc_page" class="page"> <h1>CORRECTEUR GRAMMATICAL</h1> <div id="paragraphs_list"></div> </section> | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | </div> --> <div id="page"> <section id="home_page" class="page"> <h1>GRAMMALECTE</h1> <a href="https://www.dicollecte.org/test.html"></a> </section> <section id="gc_page" class="page"> <h1>CORRECTEUR GRAMMATICAL</h1> <div id="paragraphs_list"></div> </section> |
︙ | ︙ |