From 533750a8168980ad2c0de3cb7fd620a2b591aa79 Mon Sep 17 00:00:00 2001 From: Khai Truong <56820749+khaitruong922@users.noreply.github.com> Date: Thu, 11 Jul 2024 20:48:31 +0700 Subject: [PATCH] Rename primary profile to default profile (#1198) --- ext/action-popup.html | 6 +++--- ext/js/display/search-display-controller.js | 4 ++-- ext/js/pages/action-popup-main.js | 16 ++++++++-------- ext/js/pages/generic-page-main.js | 6 +++--- ext/js/pages/info-main.js | 6 +++--- ext/search.html | 2 +- ext/settings.html | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/action-popup.html b/ext/action-popup.html index 7b3d3275ec..ddaec23206 100644 --- a/ext/action-popup.html +++ b/ext/action-popup.html @@ -31,10 +31,10 @@
- @@ -74,7 +74,7 @@

Yomitan

Profile diff --git a/ext/js/display/search-display-controller.js b/ext/js/display/search-display-controller.js index d785962f73..522b11a2c4 100644 --- a/ext/js/display/search-display-controller.js +++ b/ext/js/display/search-display-controller.js @@ -373,14 +373,14 @@ export class SearchDisplayController { const value = Number.parseInt(node.value, 10); const optionsFull = await this._display.application.api.optionsGetFull(); if (typeof value === 'number' && Number.isFinite(value) && value >= 0 && value <= optionsFull.profiles.length) { - await this._setPrimaryProfileIndex(value); + await this._setDefaultProfileIndex(value); } } /** * @param {number} value */ - async _setPrimaryProfileIndex(value) { + async _setDefaultProfileIndex(value) { /** @type {import('settings-modifications').ScopedModificationSet} */ const modification = { action: 'set', diff --git a/ext/js/pages/action-popup-main.js b/ext/js/pages/action-popup-main.js index 3cda32dbf3..59b7711c58 100644 --- a/ext/js/pages/action-popup-main.js +++ b/ext/js/pages/action-popup-main.js @@ -61,9 +61,9 @@ class DisplayController { this._setupButtonEvents('.action-open-permissions', null, chrome.runtime.getURL('/permissions.html')); const {profiles, profileCurrent} = optionsFull; - const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; - if (primaryProfile !== null) { - this._setupOptions(primaryProfile); + const defaultProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; + if (defaultProfile !== null) { + this._setupOptions(defaultProfile); } /** @type {NodeListOf} */ @@ -219,9 +219,9 @@ class DisplayController { await hotkeyHelpController.prepare(this._api); const {profiles, profileCurrent} = /** @type {import('settings').Options} */ (this._optionsFull); - const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; - if (primaryProfile !== null) { - hotkeyHelpController.setOptions(primaryProfile.options); + const defaultProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; + if (defaultProfile !== null) { + hotkeyHelpController.setOptions(defaultProfile.options); } hotkeyHelpController.setupNode(document.documentElement); @@ -260,14 +260,14 @@ class DisplayController { const node = /** @type {HTMLInputElement} */ (event.currentTarget); const value = Number.parseInt(node.value, 10); if (typeof value === 'number' && Number.isFinite(value) && value >= 0 && value <= /** @type {import('settings').Options} */ (this._optionsFull).profiles.length) { - void this._setPrimaryProfileIndex(value); + void this._setDefaultProfileIndex(value); } } /** * @param {number} value */ - async _setPrimaryProfileIndex(value) { + async _setDefaultProfileIndex(value) { /** @type {import('settings-modifications').ScopedModificationSet} */ const modification = { action: 'set', diff --git a/ext/js/pages/generic-page-main.js b/ext/js/pages/generic-page-main.js index 5f82257ef0..483da1b725 100644 --- a/ext/js/pages/generic-page-main.js +++ b/ext/js/pages/generic-page-main.js @@ -30,9 +30,9 @@ await Application.main(true, async (application) => { themeController.prepare(); const optionsFull = await application.api.optionsGetFull(); const {profiles, profileCurrent} = optionsFull; - const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; - if (primaryProfile !== null) { - themeController.theme = primaryProfile.options.general.popupTheme; + const defaultProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; + if (defaultProfile !== null) { + themeController.theme = defaultProfile.options.general.popupTheme; themeController.siteOverride = true; themeController.updateTheme(); } diff --git a/ext/js/pages/info-main.js b/ext/js/pages/info-main.js index 08abc12b5c..00e82549c6 100644 --- a/ext/js/pages/info-main.js +++ b/ext/js/pages/info-main.js @@ -125,9 +125,9 @@ await Application.main(true, async (application) => { themeController.prepare(); const optionsFull = await application.api.optionsGetFull(); const {profiles, profileCurrent} = optionsFull; - const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; - if (primaryProfile !== null) { - themeController.theme = primaryProfile.options.general.popupTheme; + const defaultProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null; + if (defaultProfile !== null) { + themeController.theme = defaultProfile.options.general.popupTheme; themeController.siteOverride = true; themeController.updateTheme(); } diff --git a/ext/search.html b/ext/search.html index 7363a66cd3..94cf184d16 100644 --- a/ext/search.html +++ b/ext/search.html @@ -37,7 +37,7 @@

Yomitan Search