Skip to content

Commit

Permalink
enhance(client): photoswipe 表示時に戻る操作をしても前の画面に戻らないように (#10098)
Browse files Browse the repository at this point in the history
* enhance(client): photoswipe 表示時に戻る操作をしても前の画面に戻らないように

* add: changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
  • Loading branch information
Khsmty and syuilo authored Feb 26, 2023
1 parent 60342ed commit 72888b4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Improvements
- feat: 検索画面の統合 (Khsmty)
- photoswipe 表示時に戻る操作をしても前の画面に戻らないように
### Bugfixes
-
Expand Down
17 changes: 17 additions & 0 deletions packages/frontend/src/components/MkMediaList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,23 @@ onMounted(() => {
});
lightbox.init();
window.addEventListener('popstate', () => {
if (lightbox.pswp && lightbox.pswp.isOpen === true) {
lightbox.pswp.close();
return;
}
});
lightbox.on('beforeOpen', () => {
history.pushState(null, '', '#pswp');
});
lightbox.on('close', () => {
if (window.location.hash === '#pswp') {
history.back();
}
});
});
const previewable = (file: misskey.entities.DriveFile): boolean => {
Expand Down

0 comments on commit 72888b4

Please sign in to comment.