Merge upstream into firefox-port

# Conflicts:
#	inject.js
This commit is contained in:
codebicycle
2017-10-04 09:04:12 +03:00
2 changed files with 4 additions and 4 deletions

View File

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

View File

@@ -1,6 +1,6 @@
document.addEventListener('DOMContentLoaded', function () { document.addEventListener('DOMContentLoaded', function () {
document.querySelector('#config').addEventListener('click', 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() { document.querySelector('#about').addEventListener('click', function() {