From 1b69741c54d59f1ad1cf55f5154bde5db2b0189c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Harck=20T=C3=B8nning?= Date: Sat, 17 Dec 2022 16:02:52 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Force=20utf-8=20encoding=20(this=20ensures?= =?UTF-8?q?=20that=20=C3=86=C3=98=C3=85=20is=20encodes=20correctly)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extension/db.html | 1 + templates/db.html | 1 + 2 files changed, 2 insertions(+) diff --git a/extension/db.html b/extension/db.html index 56b978f..370f962 100644 --- a/extension/db.html +++ b/extension/db.html @@ -1,6 +1,7 @@ + diff --git a/templates/db.html b/templates/db.html index 36efa3e..7d535b6 100644 --- a/templates/db.html +++ b/templates/db.html @@ -1,6 +1,7 @@ + From 45a6dacf807fca60f70f968a34bcce74cbafc37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Harck=20T=C3=B8nning?= Date: Sat, 17 Dec 2022 16:03:53 +0100 Subject: [PATCH 2/3] Replaces deprecations and removes browser disparities --- extension/background.js | 27 +++++---------------------- extension/contentscript.js | 25 ++----------------------- 2 files changed, 7 insertions(+), 45 deletions(-) diff --git a/extension/background.js b/extension/background.js index 29b4d76..f4ea596 100644 --- a/extension/background.js +++ b/extension/background.js @@ -1,12 +1,8 @@ -if(getBrowser() === "Chrome") { - chrome.extension.onRequest.addListener(parseMessage); -} else { - browser.runtime.onMessage.addListener(parseMessage); -} +chrome.runtime.onMessage.addListener(parseMessage); -function parseMessage(request, sender) { - course=request.getInfo - rtab=sender.tab.id +function parseMessage(request, sender, sendResponse) { + let course=request.getInfo + let rtab=sender.tab.id var resp={}; if(course in data){ @@ -20,18 +16,5 @@ function parseMessage(request, sender) { }); } chrome.browserAction.onClicked.addListener(function(tab) { - chrome.tabs.create({ url: chrome.extension.getURL('db.html') }); + chrome.tabs.create({ url: chrome.runtime.getURL('db.html') }); }); - -// From: https://stackoverflow.com/a/45985333/5257653 -function getBrowser() { - if (typeof chrome !== "undefined") { - if (typeof browser !== "undefined") { - return "Firefox"; - } else { - return "Chrome"; - } - } else { - return "Edge"; - } -} diff --git a/extension/contentscript.js b/extension/contentscript.js index ecd0a99..5345d2a 100644 --- a/extension/contentscript.js +++ b/extension/contentscript.js @@ -4,18 +4,10 @@ course = window.location.href.match( if (course.length == 5) { console.log("Course ID:", course); - if(getBrowser() == "Chrome") { - chrome.extension.sendRequest({ getInfo: course }); - } else { - browser.runtime.sendMessage({ getInfo: course }); - } + chrome.runtime.sendMessage({ getInfo: course }); } -if(getBrowser() == "Chrome") { - chrome.runtime.onMessage.addListener(listen); -} else { - browser.runtime.onMessage.addListener(listen); -} +chrome.runtime.onMessage.addListener(listen); function listen(request, sender, sendResponse) { if (request[course]) { @@ -99,16 +91,3 @@ function getColor(value) { var hue = ((1 - value) * 120).toString(10); return ["hsl(", hue, ",100%,50%)"].join(""); } - -// From: https://stackoverflow.com/a/45985333/5257653 -function getBrowser() { - if (typeof chrome !== "undefined") { - if (typeof browser !== "undefined") { - return "Firefox"; - } else { - return "Chrome"; - } - } else { - return "Edge"; - } -} From c23b18edaf75b237cbad917cc3d6e577b91fef50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Harck=20T=C3=B8nning?= Date: Sat, 17 Dec 2022 16:04:00 +0100 Subject: [PATCH 3/3] Update manifest.json --- extension/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/manifest.json b/extension/manifest.json index 7bd1a52..3e72854 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -7,7 +7,7 @@ }, "name": "DTU Course Analyzer", "description": "Analyzes and scores courses on kurser.dtu.dk/xxxxx", - "version": "1.2.5", + "version": "1.3.1", "manifest_version": 2, "icons": { "16": "icon16.png",