feat: adjust <a> tag link targe attribute

When open the homepage, top bar links should open in a new tab; when not on the homepage, they should open in the same page
starknt · Jan 9, 2024 · 770c806 · 770c806
1 parent 56c8380
commit 770c806
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/src/components/TopBar/components/ChannelsPop.vue b/src/components/TopBar/components/ChannelsPop.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
+import { isHomePage } from '~/utils/main'
 
 const { t } = useI18n()
 
@@ -62,6 +63,7 @@ const genres = [
       >
         <a
           :href="genre.href"
+          :target="isHomePage() ? '_blank' : '_self'"
           flex="~"
           items="center"
           w="170px"

diff --git a/src/components/TopBar/components/MorePop.vue b/src/components/TopBar/components/MorePop.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
-import { getUserID } from '~/utils/main'
+import { getUserID, isHomePage } from '~/utils/main'
 
 const { t } = useI18n()
 
@@ -26,7 +26,7 @@ const list = [
       v-for="item in list"
       :key="item.name"
       :href="item.url"
-      target="_blank"
+      :target="isHomePage() ? '_blank' : '_self'"
       pos="relative"
       p="x-4 y-2"
       bg="hover:$bew-fill-2"

diff --git a/src/components/TopBar/components/NotificationsPop.vue b/src/components/TopBar/components/NotificationsPop.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
+import { isHomePage } from '~/utils/main'
 
 const { t } = useI18n()
 
@@ -82,7 +83,7 @@ function getUnreadMessageCount() {
       v-for="item in list"
       :key="item.name"
       :href="item.url"
-      target="_blank"
+      :target="isHomePage() ? '_blank' : '_self'"
       pos="relative"
       p="x-4 y-2"
       bg="hover:$bew-fill-2"

diff --git a/src/components/TopBar/components/UserPanelPop.vue b/src/components/TopBar/components/UserPanelPop.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n'
 import type { UserInfo, UserStat } from '../types'
 import { revokeAccessKey } from '~/utils/authProvider'
-import { getCSRF, getUserID } from '~/utils/main'
+import { getCSRF, getUserID, isHomePage } from '~/utils/main'
 import { numFormatter } from '~/utils/dataFormatter'
 
 defineProps<{
@@ -73,12 +73,12 @@ async function logout() {
       <a
         class="group mr-4"
         href="https://account.bilibili.com/account/coin"
-        target="_blank"
+        :target="isHomePage() ? '_blank' : '_self'"
       >{{ $t('topbar.user_dropdown.money') + userInfo.money }}</a>
       <a
         class="group"
         href="https://pay.bilibili.com/pay-v2-web/bcoin_index"
-        target="_blank"
+        :target="isHomePage() ? '_blank' : '_self'"
       >{{
         $t('topbar.user_dropdown.b_coins') + userInfo.wallet?.bcoin_balance
       }}</a>
@@ -87,7 +87,7 @@ async function logout() {
       <a
         class="group"
         :href="`https://space.bilibili.com/${mid}/fans/follow`"
-        target="_blank"
+        :target="isHomePage() ? '_blank' : '_self'"
         :title="`${userStat.following}`"
       >
         <div class="num">
@@ -97,7 +97,7 @@ async function logout() {
       </a>
       <a
         :href="`https://space.bilibili.com/${mid}/fans/fans`"
-        target="_blank"
+        :target="isHomePage() ? '_blank' : '_self'"
         :title="`${userStat.follower}`"
       >
         <div class="num">
@@ -107,7 +107,7 @@ async function logout() {
       </a>
       <a
         :href="`https://space.bilibili.com/${mid}/dynamic`"
-        target="_blank"
+        :target="isHomePage() ? '_blank' : '_self'"
         :title="`${userStat.dynamic_count}`"
       >
         <div class="num">

diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts
@@ -55,8 +55,8 @@ function isSupportedPages() {
     || /https?:\/\/message.bilibili.com\.*/.test(currentUrl)
     // bilibili channel page b站分区页面
     || /https?:\/\/www.bilibili.com\/v\/.*/.test(currentUrl)
-    // anime page
-    || /https?:\/\/www.bilibili.com\/anime.*/.test(currentUrl)
+    // anime page & chinese anime page
+    || /https?:\/\/www.bilibili.com\/(anime|guochuang).*/.test(currentUrl)
     // tv shows, movie, variety shows, mooc page
     || /https?:\/\/(www.)?bilibili.com\/(tv|movie|variety|mooc).*/.test(currentUrl))
     return true