Merge upstream into firefox-port

# Conflicts:
#	inject.js

inject.js

@@ -185,7 +185,7 @@ chrome.runtime.sendMessage({}, function(response) {
 
       switch (true) {
         case (location.hostname == 'www.amazon.com'):
-        case (/www\.hbogo\./).test(location.hostname):
+        case (/hbogo\./).test(location.hostname):
           // insert before parent to bypass overlay
           this.parent.parentElement.insertBefore(fragment, this.parent);
           break;
@@ -303,10 +303,10 @@ chrome.runtime.sendMessage({}, function(response) {
               let id = node.dataset['vscid'];
               let ctrl = document.querySelector(`div[data-vscid="${id}"]`)
               if (ctrl) {
-                node.classList.remove('vsc-initialized');
-                delete node.dataset['vscid'];
                 ctrl.remove();
               }
+              node.classList.remove('vsc-initialized');
+              delete node.dataset['vscid'];
             }
           }
         } else if (node.children != undefined) {

popup.js

@@ -1,6 +1,6 @@
 document.addEventListener('DOMContentLoaded', function () {
   document.querySelector('#config').addEventListener('click', function() {
-    window.open(chrome.extension.getURL("options.html"));
+    window.open(chrome.runtime.getURL("options.html"));
   });
   
   document.querySelector('#about').addEventListener('click', function() {