diff --git a/src/components/Settings/components/Compatibility.vue b/src/components/Settings/components/Compatibility.vue index ce08722a..5b77c998 100644 --- a/src/components/Settings/components/Compatibility.vue +++ b/src/components/Settings/components/Compatibility.vue @@ -46,7 +46,7 @@ function changeThemeColor(color: string) { - + diff --git a/src/components/Settings/components/General.vue b/src/components/Settings/components/General.vue index 50a6c275..abab641c 100644 --- a/src/components/Settings/components/General.vue +++ b/src/components/Settings/components/General.vue @@ -94,10 +94,10 @@ function resetDockContent() { - + diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index b9ee6775..dc11a908 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -55,7 +55,7 @@ const favoritesPopRef = ref() const scrollTop = ref(0) const oldScrollTop = ref(0) -watch(() => settings.value.autoHideTopbar, (newVal) => { +watch(() => settings.value.autoHideTopBar, (newVal) => { if (!newVal) toggleTopBarVisible(true) }) @@ -129,7 +129,7 @@ function handleScroll() { scrollTop.value = document.documentElement.scrollTop } - if (settings.value.autoHideTopbar && !hoveringTopBar.value && scrollTop.value !== 0) { + if (settings.value.autoHideTopBar && !hoveringTopBar.value && scrollTop.value !== 0) { if (scrollTop.value > oldScrollTop.value) toggleTopBarVisible(false) diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue index c5010f34..6fc211ae 100644 --- a/src/contentScripts/views/App.vue +++ b/src/contentScripts/views/App.vue @@ -270,14 +270,14 @@ provide('scrollbarRef', scrollbarRef)
{ // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide // This feature is primarily designed to compatible with the Bilibili Evolved's top bar // Even when the BewlyBewly top bar is hidden, the Bilibili Evolved top bar still exists, so not moving up - if (settings.value.autoHideTopbar && settings.value.isShowTopbar) { + if (settings.value.autoHideTopBar && settings.value.showTopBar) { if (val) shouldMoveCtrlBarUp.value = false diff --git a/src/contentScripts/views/Home/Home.vue b/src/contentScripts/views/Home/Home.vue index b081115b..5f07b70d 100644 --- a/src/contentScripts/views/Home/Home.vue +++ b/src/contentScripts/views/Home/Home.vue @@ -62,7 +62,7 @@ onMounted(() => { // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide // This feature is primarily designed to compatible with the Bilibili Evolved's top bar // Even when the BewlyBewly top bar is hidden, the Bilibili Evolved top bar still exists, so not moving up - if (settings.value.autoHideTopbar && settings.value.isShowTopbar) { + if (settings.value.autoHideTopBar && settings.value.showTopBar) { if (val) shouldMoveTabsUp.value = false diff --git a/src/contentScripts/views/Home/components/Ranking.vue b/src/contentScripts/views/Home/components/Ranking.vue index 14c441c6..e04e5d09 100644 --- a/src/contentScripts/views/Home/components/Ranking.vue +++ b/src/contentScripts/views/Home/components/Ranking.vue @@ -62,7 +62,7 @@ onMounted(() => { // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide // This feature is primarily designed to compatible with the Bilibili Evolved's top bar // Even when the BewlyBewly top bar is hidden, the Bilibili Evolved top bar still exists, so not moving up - if (settings.value.autoHideTopbar && settings.value.isShowTopbar) { + if (settings.value.autoHideTopBar && settings.value.showTopBar) { if (val) shouldMoveAsideUp.value = false diff --git a/src/logic/storage.ts b/src/logic/storage.ts index 635157c4..cfbbebc6 100644 --- a/src/logic/storage.ts +++ b/src/logic/storage.ts @@ -11,7 +11,7 @@ export interface Settings { enableHorizontalScrolling: boolean openLinkInCurrentTab: boolean enableVideoCtrlBarOnVideoCard: boolean - autoHideTopbar: boolean + autoHideTopBar: boolean dockPosition: 'left' | 'right' | 'bottom' autoHideDock: boolean dockItemVisibilityList: { page: AppPage; visible: boolean }[] @@ -42,7 +42,7 @@ export interface Settings { searchPageModeWallpaperFixed: boolean adaptToOtherPageStyles: boolean - isShowTopbar: boolean + showTopBar: boolean useOriginalBilibiliHomepage: boolean } export const settings = useStorageLocal('settings', ref({ @@ -50,7 +50,7 @@ export const settings = useStorageLocal('settings', ref({ enableHorizontalScrolling: false, openLinkInCurrentTab: false, enableVideoCtrlBarOnVideoCard: false, - autoHideTopbar: false, + autoHideTopBar: false, dockPosition: 'right', autoHideDock: false, dockItemVisibilityList: [], @@ -81,6 +81,6 @@ export const settings = useStorageLocal('settings', ref({ searchPageModeWallpaperFixed: false, adaptToOtherPageStyles: true, - isShowTopbar: true, + showTopBar: true, useOriginalBilibiliHomepage: false, }), { mergeDefaults: true }) diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.ts index f999f3e5..c73ae590 100644 --- a/src/stores/settingsStore.ts +++ b/src/stores/settingsStore.ts @@ -7,8 +7,8 @@ interface Settings { enableHorizontalScrolling: boolean openLinkInCurrentTab: boolean enableVideoCtrlBarOnVideoCard: boolean - isShowTopbar: boolean - autoHideTopbar: boolean + showTopBar: boolean + autoHideTopBar: boolean dockPosition: 'left' | 'right' | 'bottom' autoHideDock: boolean dockItemVisibilityList: { page: AppPage; visible: boolean }[] @@ -47,8 +47,8 @@ export const useSettingsStore = defineStore('settings', () => { enableHorizontalScrolling: false, openLinkInCurrentTab: false, enableVideoCtrlBarOnVideoCard: false, - isShowTopbar: true, - autoHideTopbar: false, + showTopBar: true, + autoHideTopBar: false, dockPosition: 'right', autoHideDock: false, dockItemVisibilityList: [],