Converted more code to TypeScript.

src/background.ts

@@ -1,12 +1,17 @@
-isBackgroundScript = true;
+import Utils from "./utils";
+import SB from "./SB";
+
+import * as Types from "./types";
+
+Utils.isBackgroundScript = true;
 
 // Used only on Firefox, which does not support non persistent background pages.
 var contentScriptRegistrations = {};
 
 // Register content script if needed
-if (isFirefox()) {
+if (Utils.isFirefox()) {
-    wait(() => SB.config !== undefined).then(function() {
+    Utils.wait(() => SB.config !== undefined).then(function() {
-        if (SB.config.supportInvidious) setupExtraSiteContentScripts();
+        if (SB.config.supportInvidious) Utils.setupExtraSiteContentScripts();
     });
 } 
 
@@ -77,7 +82,7 @@ chrome.runtime.onInstalled.addListener(function (object) {
             chrome.tabs.create({url: chrome.extension.getURL("/help/index_en.html")});
 
             //generate a userID
-            const newUserID = generateUserID();
+            const newUserID = Utils.generateUserID();
             //save this UUID
             SB.config.userID = newUserID;
             
@@ -143,7 +148,7 @@ function submitVote(type, UUID, callback) {
 
     if (userID == undefined || userID === "undefined") {
         //generate one
-        userID = generateUserID();
+        userID = Utils.generateUserID();
         SB.config.userID = userID;
     }
 
@@ -176,7 +181,7 @@ async function submitTimes(videoID, callback) {
     let userID = SB.config.userID;
 		
     if (sponsorTimes != undefined && sponsorTimes.length > 0) {
-        let durationResult = await new Promise((resolve, reject) => {
+        let durationResult = <Types.videoDurationResponse> await new Promise((resolve, reject) => {
             chrome.tabs.query({
                 active: true,
                 currentWindow: true
@@ -196,31 +201,29 @@ async function submitTimes(videoID, callback) {
 
         //submit these times
         for (let i = 0; i < sponsorTimes.length; i++) {
-                //to prevent it from happeneing twice
+            //to prevent it from happeneing twice
-                let increasedContributionAmount = false;
+            let increasedContributionAmount = false;
 
-                //submit the sponsorTime
+            //submit the sponsorTime
-                sendRequestToServer("GET", "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
+            sendRequestToServer("GET", "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
-                + "&userID=" + userID, function(xmlhttp, error) {
+                    + "&userID=" + userID, function(xmlhttp, error) {
-					if (xmlhttp.readyState == 4 && !error) {
+                if (xmlhttp.readyState == 4 && !error) {
-                        callback({
+                    callback({
-                            statusCode: xmlhttp.status
+                        statusCode: xmlhttp.status
-                        });
+                    });
 
                     if (xmlhttp.status == 200) {
-                        //add these to the storage log
+                        //save the amount contributed
-                                currentContributionAmount = SB.config.sponsorTimesContributed;
+                        if (!increasedContributionAmount) {
-                                //save the amount contributed
+                            increasedContributionAmount = true;
-                                if (!increasedContributionAmount) {
+                            SB.config.sponsorTimesContributed = SB.config.sponsorTimesContribute + sponsorTimes.length;
-                                    increasedContributionAmount = true;
-                                    SB.config.sponsorTimesContributed = currentContributionAmount + sponsorTimes.length;
-                                }
                         }
                     } else if (error) {
                         callback({
                             statusCode: -1
                         });
                     }
+                }  
             });
         }
     }

src/content.ts

@@ -112,7 +112,7 @@ function messageListener(request, sender, sendResponse) {
             break;
         case "getVideoDuration":
             sendResponse({
-            duration: v.duration
+                duration: v.duration
             });
 
             break;

src/js-components/previewBar.ts

@@ -75,7 +75,7 @@ class PreviewBar {
 			bar.style.left = (timestamps[i][0] / duration * 100) + "%";
 			bar.style.position = "absolute"
 
-			this.container.insertAdjacentElement("beforeEnd", bar);
+			this.container.insertAdjacentElement("beforeend", bar);
 		}
 	}
 

src/types.ts

@@ -0,0 +1,7 @@
+interface videoDurationResponse {
+    duration: number;
+}
+
+export {
+    videoDurationResponse
+};

src/utils.ts

@@ -134,7 +134,7 @@ class Utils {
                 matches: this.getInvidiousInstancesRegex()
             };
 
-            if (isBackgroundScript) {
+            if (this.isBackgroundScript) {
                 registerFirefoxContentScript(registration);
             } else {
                 chrome.runtime.sendMessage(registration);
@@ -172,7 +172,7 @@ class Utils {
         if (this.isFirefox()) {
             let id = "invidious";
 
-            if (isBackgroundScript) {
+            if (this.isBackgroundScript) {
                 if (contentScriptRegistrations[id]) {
                     contentScriptRegistrations[id].unregister();
                     delete contentScriptRegistrations[id];