commit 409207b73dee9da12758f38f3acca7d716c8bbfc Author: OverPoweredDev Date: Sun Jul 18 15:46:07 2021 +0530 removed some warnings I'm leaving the duplicated jQuery selectors, it's better that way tbh diff --git a/src/content/content.js b/src/content/content.js index 4ac191f..88a8fac 100644 --- a/src/content/content.js +++ b/src/content/content.js @@ -9,9 +9,9 @@ jQuery.fn.ownText = function () { }).text(); }; -browser.runtime.sendMessage({method: "getSettings"}, function (response) { +browser.runtime.sendMessage({method: "getSettings"}, async function (response) { settings = response.settings; - addHoverElements(settings); + await addHoverElements(settings); }); browser.runtime.onMessage.addListener(async function(request, sender, sendResponse) { diff --git a/src/lib/storage.js b/src/lib/storage.js index 887b448..261416c 100644 --- a/src/lib/storage.js +++ b/src/lib/storage.js @@ -238,7 +238,7 @@ async function detectLanguage(text){ let max = -Infinity, x, languageCode; for(x in possibleLanguageList) { - if( possibleLanguageList[x] > max) { + if(possibleLanguageList.hasOwnProperty(x) && possibleLanguageList[x] > max) { max = possibleLanguageList[x]; languageCode = x; } diff --git a/src/popup/popup.js b/src/popup/popup.js index 828007c..89bdcf5 100644 --- a/src/popup/popup.js +++ b/src/popup/popup.js @@ -105,8 +105,8 @@ $("#translate-webpage-button").on('click', function () { return window.browser || window.chrome; })(); - chrome.tabs.query({active: true, currentWindow: true}, function(tabs){ - chrome.tabs.sendMessage(tabs[0].id, {method: "translateWebpage"}, function(response) {}); + browser.tabs.query({active: true, currentWindow: true}, function(tabs){ + browser.tabs.sendMessage(tabs[0].id, {method: "translateWebpage"}, function(response) {}); }); }); diff --git a/src/settings/settings.js b/src/settings/settings.js index 2c6955e..d1cba50 100644 --- a/src/settings/settings.js +++ b/src/settings/settings.js @@ -1,15 +1,9 @@ let globalSettings; init(); -$("#default-target-language-button").on('click', function (e) { - e.stopPropagation(); - - let dropdown = $("#target-language-dropdown")[0]; - if (dropdown.style.display === "none") { - dropdown.style.display = "block"; - } else { - dropdown.style.display = "none"; - } +$("#update-button").on('click', async function () { + await updateLanguagePairs(); + setLastUpdated(new Date().toLocaleString()); }); $(".enabled-language").on('click', function () { @@ -20,9 +14,15 @@ $(".enabled-language").on('click', function () { saveGlobalSettings(globalSettings); }); -$("#update-button").on('click', async function () { - await updateLanguagePairs(); - setLastUpdated(new Date().toLocaleString()); +$("#default-target-language-button").on('click', function (e) { + e.stopPropagation(); + + let dropdown = $("#target-language-dropdown")[0]; + if (dropdown.style.display === "none") { + dropdown.style.display = "block"; + } else { + dropdown.style.display = "none"; + } }); $("#source-select").on('click', async function () {