From 0100ec469cd1ce6ab8ef5fb742d39f81cbb6be0c Mon Sep 17 00:00:00 2001 From: Alexander Danilov Date: Fri, 18 Dec 2020 15:09:20 +0300 Subject: [PATCH 1/2] Added support for Beta channel --- public/_locales/en/messages.json | 3 ++ src/background/intel.js | 4 +++ src/background/manager.js | 8 +++++ src/popup/components/ElementPlugin.vue | 1 + src/popup/components/SectionOptions.vue | 39 ++++++++++++++++--------- src/popup/components/mixins.js | 2 ++ src/popup/data.js | 2 ++ 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index 5cfa5f9..4081f51 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -49,6 +49,9 @@ "release": { "message": "Release" }, + "beta": { + "message": "Beta" + }, "testBuilds": { "message": "Test builds" }, diff --git a/src/background/intel.js b/src/background/intel.js index 846571f..a08a73c 100644 --- a/src/background/intel.js +++ b/src/background/intel.js @@ -60,15 +60,19 @@ async function initialize() { "IITC_is_enabled", "channel", "release_iitc_code", + "beta_iitc_code", "test_iitc_code", "local_iitc_code", "release_plugins_flat", + "beta_plugins_flat", "test_plugins_flat", "local_plugins_flat", "release_plugins_local", + "beta_plugins_local", "test_plugins_local", "local_plugins_local", "release_plugins_user", + "beta_plugins_user", "test_plugins_user", "local_plugins_user" ]); diff --git a/src/background/manager.js b/src/background/manager.js index af9afc8..255800c 100644 --- a/src/background/manager.js +++ b/src/background/manager.js @@ -11,6 +11,7 @@ let external_update_timeout_id = null; let channel = "release"; const network_host = { release: "https://iitc.app/build/release", + beta: "https://iitc.app/build/beta", test: "https://iitc.app/build/test", local: "http://localhost:8000" }; @@ -101,21 +102,27 @@ export async function checkUpdates(force) { "last_check_update", "local_server_host", "release_update_check_interval", + "beta_update_check_interval", "test_update_check_interval", "local_update_check_interval", "release_last_modified", + "beta_last_modified", "test_last_modified", "local_last_modified", "release_categories", + "beta_categories", "test_categories", "local_categories", "release_plugins_flat", + "beta_plugins_flat", "test_plugins_flat", "local_plugins_flat", "release_plugins_local", + "beta_plugins_local", "test_plugins_local", "local_plugins_local", "release_plugins_user", + "beta_plugins_user", "test_plugins_user", "local_plugins_user" ]); @@ -250,6 +257,7 @@ export async function checkExternalUpdates(force) { "last_check_external_update", "external_update_check_interval", "release_plugins_user", + "beta_plugins_user", "test_plugins_user", "local_plugins_user" ]); diff --git a/src/popup/components/ElementPlugin.vue b/src/popup/components/ElementPlugin.vue index 0556573..993774f 100644 --- a/src/popup/components/ElementPlugin.vue +++ b/src/popup/components/ElementPlugin.vue @@ -124,6 +124,7 @@ export default { const data = await browser.storage.local.get([ "channel", "release_plugins_user", + "beta_plugins_user", "test_plugins_user", "local_plugins_user" ]); diff --git a/src/popup/components/SectionOptions.vue b/src/popup/components/SectionOptions.vue index 1a7a026..03c2288 100644 --- a/src/popup/components/SectionOptions.vue +++ b/src/popup/components/SectionOptions.vue @@ -8,20 +8,22 @@ >

{{ _("choosingUpdateChannel") }}

-

- - -

+
+

+ + +

+
@@ -31,6 +33,9 @@ + @@ -99,9 +104,11 @@ export default { const data = await browser.storage.local.get([ "release_categories", + "beta_categories", "test_categories", "local_categories", "release_plugins_flat", + "beta_plugins_flat", "test_plugins_flat", "local_plugins_flat" ]); @@ -186,4 +193,8 @@ h2:first-letter { .local-server__input__err { color: var(--state-off); } + +.channels-row { + column-count: 2; +} diff --git a/src/popup/components/mixins.js b/src/popup/components/mixins.js index 551e845..2cee52a 100644 --- a/src/popup/components/mixins.js +++ b/src/popup/components/mixins.js @@ -6,11 +6,13 @@ export const mixin = { return { updateChannels: { release: { name: _("release") }, + beta: { name: _("beta") }, test: { name: _("testBuilds") }, local: { name: _("localServer") } }, updateChannelsIntervals: { release: { name: _("release") }, + beta: { name: _("beta") }, test: { name: _("testBuilds") }, external: { name: _("anyChannel") } }, diff --git a/src/popup/data.js b/src/popup/data.js index fedfdbe..60a7fb0 100644 --- a/src/popup/data.js +++ b/src/popup/data.js @@ -4,9 +4,11 @@ export async function init(self) { const data = await browser.storage.local.get([ "channel", "release_categories", + "beta_categories", "test_categories", "local_categories", "release_plugins_flat", + "beta_plugins_flat", "test_plugins_flat", "local_plugins_flat" ]); From d482bfefe5920a2e80b0a99b07f558bc71949a08 Mon Sep 17 00:00:00 2001 From: Alexander Danilov Date: Fri, 18 Dec 2020 15:09:24 +0300 Subject: [PATCH 2/2] 1.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 324481b..e1fe3f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iitc-button", - "version": "1.6.1", + "version": "1.6.2", "repository": "https://github.com/IITC-CE/IITC-Button.git", "license": "GPLv3", "private": true,