Merge pull request #19 from SMKIDRaadet/Merge-chrome-and-firefox

Merge chrome and firefox
SMKIDRaadet · Dec 17, 2022 · 4b65816 · 4b65816
2 parents 4b2d8cf + c23b18e
commit 4b65816
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 46 deletions.
diff --git 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
@@ -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";
-  }
-}
diff --git a/extension/db.html b/extension/db.html
@@ -1,6 +1,7 @@
 <html>
 
 <head>
+<meta charset="utf-8">
 <script src="js/jquery.js" type="text/javascript"></script>
 <script src="js/jquery.dataTables.js" type="text/javascript"></script>
 <script src="js/init_table.js" type="text/javascript"></script>

diff --git 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",

diff --git a/templates/db.html b/templates/db.html
@@ -1,6 +1,7 @@
 <html>
 
 <head>
+<meta charset="utf-8">
 <script src="js/jquery.js" type="text/javascript"></script>
 <script src="js/jquery.dataTables.js" type="text/javascript"></script>
 <script src="js/init_table.js" type="text/javascript"></script>