Cleanup code, replace audio with versions from MarioCubeLite

js/background.js

@@ -17,9 +17,8 @@ var themeAudio = new Audio(chrome.extension.getURL('wii-shop-theme.ogg'))
 themeAudio.volume = 0.5
 themeAudio.loop = true
 
-// Detect new page loads in active tab, if the domain matches a shopping site, play music
-chrome.tabs.onUpdated.addListener(function (tabId, changeInfo) {
-        chrome.tabs.query({ active: true, lastFocusedWindow: true }, function (tabs) {
+// Function for checking if music should be playing in current tab
+function checkMusic(tabs) {
     var url = new URL(tabs[0].url)
     var domain = url.hostname.toString().replace('www.', '')
     console.log(domain)
@@ -28,21 +27,19 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo) {
     } else {
         themeAudio.pause()
     }
+}
+
+// Detect new page loads in active tab, if the domain matches a shopping site, play music
+chrome.tabs.onUpdated.addListener(function (tabId, changeInfo) {
+    chrome.tabs.query({ active: true, lastFocusedWindow: true }, function (tabs) {
+        checkMusic(tabs)
     })
 })
 
 // Detect shopping tab becoming inactive/closed, if the domain matches a shopping site, play music
 chrome.tabs.onActivated.addListener(function (activeInfo) {
-  chrome.tabs.get(activeInfo.tabId, function(tab) {
-    var url = new URL(tab.url)
-    var domain = url.hostname.toString().replace('www.','')
-    console.log(domain)
-    if (!siteList.includes(domain)) {
-        themeAudio.pause()
-    }
-    else {
-      themeAudio.play()
-    }
+    chrome.tabs.query({ active: true, lastFocusedWindow: true }, function (tabs) {
+        checkMusic(tabs)
     })
 })