summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfuyu <54523771+mfmfuyu@users.noreply.github.com>2020-02-03 21:05:13 +0900
committerGitHub <noreply@github.com>2020-02-03 21:05:13 +0900
commit2a5a055d1ca2f1b3ba3f12f9df9ca704587e7f6c (patch)
tree3feffa4c7c9a09b5c474833f2165ac4e39f80930 /src
parentMerge pull request #5807 from syuilo/patch/autogen/v11 (diff)
downloadsharkey-2a5a055d1ca2f1b3ba3f12f9df9ca704587e7f6c.tar.gz
sharkey-2a5a055d1ca2f1b3ba3f12f9df9ca704587e7f6c.tar.bz2
sharkey-2a5a055d1ca2f1b3ba3f12f9df9ca704587e7f6c.zip
ページバック前に判定を追加 (#5822)
Diffstat (limited to 'src')
-rw-r--r--src/client/app.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/app.vue b/src/client/app.vue
index 75036b01e8..d2880be59f 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -251,7 +251,7 @@ export default Vue.extend({
methods: {
back() {
- window.history.back();
+ if (this.canBack) window.history.back();
},
post() {
@@ -814,7 +814,7 @@ export default Vue.extend({
> [data-icon] {
width: ($header-height - ($avatar-margin * 2));
}
-
+
> [data-icon],
> .avatar {
margin-right: $avatar-margin;