From c56e6760317cdbda7338071756870754dbcb3c64 Mon Sep 17 00:00:00 2001 From: Kajitsy Date: Sat, 6 Jan 2024 00:08:16 +0300 Subject: [PATCH] 2.2.1 Update --- chromium/_locales/en/messages.json | 2 +- chromium/_locales/es/messages.json | 2 +- chromium/_locales/jp/messages.json | 2 +- chromium/_locales/ru/messages.json | 2 +- chromium/manifest.json | 2 +- chromium/onlyGi.js | 2 +- chromium/onlyHsr.js | 2 +- chromium/options_background.js | 53 ++++++++---------------------- firefox/_locales/en/messages.json | 2 +- firefox/_locales/es/messages.json | 2 +- firefox/_locales/jp/messages.json | 2 +- firefox/_locales/ru/messages.json | 2 +- firefox/manifest.json | 2 +- firefox/onlyGi.js | 2 +- firefox/onlyHsr.js | 2 +- firefox/options_background.js | 53 ++++++++---------------------- 16 files changed, 42 insertions(+), 92 deletions(-) diff --git a/chromium/_locales/en/messages.json b/chromium/_locales/en/messages.json index f10c066..21ebf31 100644 --- a/chromium/_locales/en/messages.json +++ b/chromium/_locales/en/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "With Genshin/Star Rail CodeEntter, you can quickly input promo codes for Genshin Impact and Honkai Star Rail, and also share a link to this tool :) ChromiumVersion 2.2.0" + "message": "With Genshin/Star Rail CodeEntter, you can quickly input promo codes for Genshin Impact and Honkai Star Rail, and also share a link to this tool :) ChromiumVersion 2.2.1" }, "submit": { "message": "Submit" diff --git a/chromium/_locales/es/messages.json b/chromium/_locales/es/messages.json index 22941ce..5551372 100644 --- a/chromium/_locales/es/messages.json +++ b/chromium/_locales/es/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Con Genshin/Star Rail CodeEntter, puedes ingresar rápidamente códigos promocionales para Genshin Impact y Honkai Star Rail, ¡y también compartir un enlace a esta herramienta :) ChromiumVersion 2.2.0" + "message": "Con Genshin/Star Rail CodeEntter, puedes ingresar rápidamente códigos promocionales para Genshin Impact y Honkai Star Rail, ¡y también compartir un enlace a esta herramienta :) ChromiumVersion 2.2.1" }, "submit": { "message": "Enviar" diff --git a/chromium/_locales/jp/messages.json b/chromium/_locales/jp/messages.json index 0fd1e11..0f7ebf3 100644 --- a/chromium/_locales/jp/messages.json +++ b/chromium/_locales/jp/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Genshin/Star Rail CodeEntterを使用すると、Genshin ImpactおよびHonkai Star Railのプロモコードを素早く入力でき、またこのツールのリンクを共有することもできます :) ChromiumVersion 2.2.0" + "message": "Genshin/Star Rail CodeEntterを使用すると、Genshin ImpactおよびHonkai Star Railのプロモコードを素早く入力でき、またこのツールのリンクを共有することもできます :) ChromiumVersion 2.2.1" }, "submit": { "message": "送信" diff --git a/chromium/_locales/ru/messages.json b/chromium/_locales/ru/messages.json index dc34b0c..9308ac0 100644 --- a/chromium/_locales/ru/messages.json +++ b/chromium/_locales/ru/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Благодаря Genshin/Star Rail CodeEntter вы сможете быстро вводить промокоды для Genshin Impact и Honkai Star Rail, a также можете поделиться ссылкой на этот кодик :) ChromiumVersion 2.2.0" + "message": "Благодаря Genshin/Star Rail CodeEntter вы сможете быстро вводить промокоды для Genshin Impact и Honkai Star Rail, a также можете поделиться ссылкой на этот кодик :) ChromiumVersion 2.2.1" }, "submit": { "message": "Ввести" diff --git a/chromium/manifest.json b/chromium/manifest.json index d8ada2e..e52c3c4 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Genshin/Star Rail CodeEntter", - "version": "2.2.0", + "version": "2.2.1", "description": "__MSG_extensionDescription__", "default_locale": "en", "icons": { diff --git a/chromium/onlyGi.js b/chromium/onlyGi.js index c2444e7..f5450c5 100644 --- a/chromium/onlyGi.js +++ b/chromium/onlyGi.js @@ -73,7 +73,7 @@ browser.storage.local.get(['buttonColorGi', 'buttonTextColorGi', 'BackgroundGi', document.body.style.background = result.BackgroundColorGi; } else { - document.body.style.background = 'url("/pictures/backgroundGi.png")'; + document.body.style.background = 'url("/pictures/backgroundGI.png")'; document.body.style.backgroundSize = 'cover'; document.body.style.backgroundRepeat = 'no-repeat'; document.body.style.backgroundPosition = 'center'; diff --git a/chromium/onlyHsr.js b/chromium/onlyHsr.js index 85099bd..80617ed 100644 --- a/chromium/onlyHsr.js +++ b/chromium/onlyHsr.js @@ -71,7 +71,7 @@ browser.storage.local.get(['buttonColorHsr', 'buttonTextColorHsr', 'BackgroundHs document.body.style.background = result.BackgroundColorHsr; } else { - document.body.style.background = 'url("/pictures/BackgroundHsr.png")'; + document.body.style.background = 'url("/pictures/backgroundHSR.png")'; document.body.style.backgroundSize = 'cover'; document.body.style.backgroundRepeat = 'no-repeat'; document.body.style.backgroundPosition = 'center'; diff --git a/chromium/options_background.js b/chromium/options_background.js index d8ab42d..83c165f 100644 --- a/chromium/options_background.js +++ b/chromium/options_background.js @@ -2,48 +2,15 @@ if (typeof browser === "undefined") { browser = chrome; browser.browserAction = chrome.action; } -browser.storage.onChanged.addListener(function(changes, areaName) { - if (areaName === 'local' && 'onlyGi' in changes) { - if (changes.onlyGi.newValue) { - browser.browserAction.setPopup({ - popup: 'onlyGi.html' - }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } - } -}); - -browser.storage.onChanged.addListener(function(changes, areaName) { - if (areaName === 'local' && 'onlyHsr' in changes) { - if (changes.onlyHsr.newValue) { - browser.browserAction.setPopup({ - popup: 'onlyHsr.html' - }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } - } -}); +async function updatePopup() { + const resultGi = await browser.storage.local.get('onlyGi'); + const resultHsr = await browser.storage.local.get('onlyHsr'); -browser.storage.local.get('onlyGi', function(result) { - if (result.onlyGi) { + if (resultGi.onlyGi) { browser.browserAction.setPopup({ popup: 'onlyGi.html' }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } -}); - -browser.storage.local.get('onlyHsr', function(result) { - if (result.onlyHsr) { + } else if (resultHsr.onlyHsr) { browser.browserAction.setPopup({ popup: 'onlyHsr.html' }); @@ -52,4 +19,12 @@ browser.storage.local.get('onlyHsr', function(result) { popup: 'popup.html' }); } -}); \ No newline at end of file +} + +browser.storage.onChanged.addListener(async function(changes, areaName) { + if (areaName === 'local' && ('onlyGi' in changes || 'onlyHsr' in changes)) { + await updatePopup(); + } +}); + +updatePopup(); \ No newline at end of file diff --git a/firefox/_locales/en/messages.json b/firefox/_locales/en/messages.json index 0dc6e2b..bec5d98 100644 --- a/firefox/_locales/en/messages.json +++ b/firefox/_locales/en/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "With Genshin/Star Rail CodeEnter, you can quickly input promo codes for Genshin Impact and Honkai Star Rail, and also share a link to this tool :) Firefox Version 2.2.0" + "message": "With Genshin/Star Rail CodeEnter, you can quickly input promo codes for Genshin Impact and Honkai Star Rail, and also share a link to this tool :) FirefoxVersion 2.2.1" }, "submit": { "message": "Submit" diff --git a/firefox/_locales/es/messages.json b/firefox/_locales/es/messages.json index 91bdd81..5e443e1 100644 --- a/firefox/_locales/es/messages.json +++ b/firefox/_locales/es/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Con Genshin/Star Rail CodeEnter, puedes ingresar rápidamente códigos promocionales para Genshin Impact y Honkai Star Rail, ¡y también compartir un enlace a esta herramienta :) Versión de Firefox 2.2.0" + "message": "Con Genshin/Star Rail CodeEnter, puedes ingresar rápidamente códigos promocionales para Genshin Impact y Honkai Star Rail, ¡y también compartir un enlace a esta herramienta :) FirefoxVersion 2.2.1" }, "submit": { "message": "Enviar" diff --git a/firefox/_locales/jp/messages.json b/firefox/_locales/jp/messages.json index 90b3114..55717f6 100644 --- a/firefox/_locales/jp/messages.json +++ b/firefox/_locales/jp/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Genshin/Star Rail CodeEnterを使用すると、Genshin ImpactおよびHonkai Star Railのプロモコードを素早く入力でき、またこのツールのリンクを共有することもできます :) FirefoxVersion 2.2.0" + "message": "Genshin/Star Rail CodeEnterを使用すると、Genshin ImpactおよびHonkai Star Railのプロモコードを素早く入力でき、またこのツールのリンクを共有することもできます :) FirefoxVersion 2.2.1" }, "submit": { "message": "送信" diff --git a/firefox/_locales/ru/messages.json b/firefox/_locales/ru/messages.json index 09c710d..d97e313 100644 --- a/firefox/_locales/ru/messages.json +++ b/firefox/_locales/ru/messages.json @@ -1,6 +1,6 @@ { "extensionDescription": { - "message": "Благодаря Genshin/Star Rail CodeEntter вы сможете быстро вводить промокоды для Genshin Impact и Honkai Star Rail, a также можете поделиться ссылкой на этот кодик :) FirefoxVersion 2.2.0" + "message": "Благодаря Genshin/Star Rail CodeEntter вы сможете быстро вводить промокоды для Genshin Impact и Honkai Star Rail, a также можете поделиться ссылкой на этот кодик :) FirefoxVersion 2.2.1" }, "submit": { "message": "Ввести" diff --git a/firefox/manifest.json b/firefox/manifest.json index ea28e58..a1333d2 100644 --- a/firefox/manifest.json +++ b/firefox/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Genshin/Star Rail CodeEntter", - "version": "2.2.0", + "version": "2.2.1", "description": "__MSG_extensionDescription__", "default_locale": "en", "icons": { diff --git a/firefox/onlyGi.js b/firefox/onlyGi.js index 25c8a9f..f1f1e0e 100644 --- a/firefox/onlyGi.js +++ b/firefox/onlyGi.js @@ -70,7 +70,7 @@ browser.storage.local.get(['buttonColorGi', 'buttonTextColorGi', 'BackgroundGi', document.body.style.background = result.BackgroundColorGi; } else { - document.body.style.background = 'url("/pictures/backgroundGi.png")'; + document.body.style.background = 'url("/pictures/backgroundGI.png")'; document.body.style.backgroundSize = 'cover'; document.body.style.backgroundRepeat = 'no-repeat'; document.body.style.backgroundPosition = 'center'; diff --git a/firefox/onlyHsr.js b/firefox/onlyHsr.js index 5463ed3..c7a6f3c 100644 --- a/firefox/onlyHsr.js +++ b/firefox/onlyHsr.js @@ -68,7 +68,7 @@ browser.storage.local.get(['buttonColorHsr', 'buttonTextColorHsr', 'BackgroundHs document.body.style.background = result.BackgroundColorHsr; } else { - document.body.style.background = 'url("/pictures/BackgroundHsr.png")'; + document.body.style.background = 'url("/pictures/backgroundHSR.png")'; document.body.style.backgroundSize = 'cover'; document.body.style.backgroundRepeat = 'no-repeat'; document.body.style.backgroundPosition = 'center'; diff --git a/firefox/options_background.js b/firefox/options_background.js index 0890fb4..1735b40 100644 --- a/firefox/options_background.js +++ b/firefox/options_background.js @@ -1,45 +1,12 @@ -browser.storage.onChanged.addListener(function(changes, areaName) { - if (areaName === 'local' && 'onlyGi' in changes) { - if (changes.onlyGi.newValue) { - browser.browserAction.setPopup({ - popup: 'onlyGi.html' - }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } - } -}); - -browser.storage.onChanged.addListener(function(changes, areaName) { - if (areaName === 'local' && 'onlyHsr' in changes) { - if (changes.onlyHsr.newValue) { - browser.browserAction.setPopup({ - popup: 'onlyHsr.html' - }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } - } -}); +async function updatePopup() { + const resultGi = await browser.storage.local.get('onlyGi'); + const resultHsr = await browser.storage.local.get('onlyHsr'); -browser.storage.local.get('onlyGi', function(result) { - if (result.onlyGi) { + if (resultGi.onlyGi) { browser.browserAction.setPopup({ popup: 'onlyGi.html' }); - } else { - browser.browserAction.setPopup({ - popup: 'popup.html' - }); - } -}); - -browser.storage.local.get('onlyHsr', function(result) { - if (result.onlyHsr) { + } else if (resultHsr.onlyHsr) { browser.browserAction.setPopup({ popup: 'onlyHsr.html' }); @@ -48,4 +15,12 @@ browser.storage.local.get('onlyHsr', function(result) { popup: 'popup.html' }); } -}); \ No newline at end of file +} + +browser.storage.onChanged.addListener(async function(changes, areaName) { + if (areaName === 'local' && ('onlyGi' in changes || 'onlyHsr' in changes)) { + await updatePopup(); + } +}); + +updatePopup(); \ No newline at end of file