Skip to content

Commit

Permalink
Merge branch 'BewlyBewly:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MengNianxiaoyao authored Apr 23, 2024
2 parents ac95520 + c145ec1 commit bdda56a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
token: ${{ secrets.RELEASE_TOKEN }}
release-type: node
package-name: release-please-action
release-as: 0.16.7
release-as: 0.17.0
signoff: 'github-actions <41898282+github-actions[bot]@users.noreply.github.com>'
changelog-types: '[{"type":"types","section":"Types","hidden":false},{"type":"revert","section":"Reverts","hidden":false},{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"improvement","section":"Feature Improvements","hidden":false},{"type":"docs","section":"Docs","hidden":false},{"type":"i18n","section":"I18n","hidden":true},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":true},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'
default-branch: main
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: pnpm/[email protected]
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: lts/*
cache: pnpm

- name: Install
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: pnpm/[email protected]
- uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: lts/*
cache: pnpm

- name: Install
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [0.17.0](https://github.com/hakadao/BewlyBewly/compare/v0.16.7...v0.17.0) (2024-04-22)


### Features

* implement a fake not interested feature in web recommend video card ([37c63b3](https://github.com/hakadao/BewlyBewly/commit/37c63b3b7c594904c1aca4e1d63e5840e9c3f7af))


### Bug Fixes

* only cantonese & mandarin tw use traditional chinese ([#623](https://github.com/hakadao/BewlyBewly/issues/623)) ([18e77fd](https://github.com/hakadao/BewlyBewly/commit/18e77fdd6eab586049ca5ac2350aa06d00549b36))
* tab missing after costuming order ([#634](https://github.com/hakadao/BewlyBewly/issues/634)) ([e51f486](https://github.com/hakadao/BewlyBewly/commit/e51f48617669da77f5be0b7eb8eb423b8d9700e4))
* 右侧dock自动隐藏和滚动条的冲突 ([#632](https://github.com/hakadao/BewlyBewly/issues/632)) ([2bed50f](https://github.com/hakadao/BewlyBewly/commit/2bed50f2cbac89b2b4c72154dc2e56d373f17b4e))

## [0.16.7](https://github.com/hakadao/BewlyBewly/compare/v0.16.6...v0.16.7) (2024-04-22)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bewly-bewly",
"displayName": "BewlyBewly",
"version": "0.16.7",
"version": "0.17.0",
"private": true,
"packageManager": "[email protected]",
"description": "Just make a few small changes to your Bilibili homepage.",
Expand Down
11 changes: 7 additions & 4 deletions src/components/HorizontalScrollView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ const scrollListWrap = ref<HTMLElement>() as Ref<HTMLElement>
// const showRightMask = ref<boolean>(false)
const showScrollMask = ref<boolean>(true)
watch(() => settings.value.enableHorizontalScrolling, (newValue) => {
if (newValue)
scrollListWrap.value.addEventListener('wheel', handleMouseScroll)
watch([() => settings.value.enableHorizontalScrolling, scrollListWrap], ([enableHorizontalScrolling, scrollListWrap]) => {
if (!scrollListWrap)
return
if (enableHorizontalScrolling)
scrollListWrap.addEventListener('wheel', handleMouseScroll)
else
scrollListWrap.value.removeEventListener('wheel', handleMouseScroll)
scrollListWrap.removeEventListener('wheel', handleMouseScroll)
})
onMounted(() => {
Expand Down

0 comments on commit bdda56a

Please sign in to comment.