From 30f2da421548744d4f67571cbb14c204365533fa Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Mon, 8 Apr 2019 14:41:23 +0900 Subject: [PATCH] Fix bug --- src/client/app/common/views/deck/deck.notes.vue | 6 +++--- src/client/app/desktop/views/components/notes.vue | 6 +++--- src/client/app/desktop/views/home/favorites.vue | 4 ++-- src/client/app/mobile/views/components/notes.vue | 6 +++--- src/client/app/mobile/views/pages/favorites.vue | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/client/app/common/views/deck/deck.notes.vue b/src/client/app/common/views/deck/deck.notes.vue index 26af7005f..bc67f4911 100644 --- a/src/client/app/common/views/deck/deck.notes.vue +++ b/src/client/app/common/views/deck/deck.notes.vue @@ -27,7 +27,7 @@ </component> <footer v-if="more"> - <button @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <button @click="fetchMore()" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $t('@.load-more') }}</template> <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template> </button> @@ -129,7 +129,7 @@ export default Vue.extend({ }); }, - more() { + fetchMore() { if (!this.more || this.moreFetching) return; this.moreFetching = true; this.makePromise(this.notes[this.notes.length - 1].id).then(x => { @@ -180,7 +180,7 @@ export default Vue.extend({ }, onBottom() { - this.more(); + this.fetchMore(); } } }); diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index c98ac1e9b..3fad7c922 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -26,7 +26,7 @@ </component> <footer v-if="more"> - <button @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <button @click="fetchMore()" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $t('@.load-more') }}</template> <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template> </button> @@ -122,7 +122,7 @@ export default Vue.extend({ }); }, - more() { + fetchMore() { if (!this.more || this.moreFetching) return; this.moreFetching = true; this.makePromise(this.notes[this.notes.length - 1].id).then(x => { @@ -182,7 +182,7 @@ export default Vue.extend({ if (this.$store.state.settings.fetchOnScroll !== false) { const current = window.scrollY + window.innerHeight; - if (current > document.body.offsetHeight - 8) this.more(); + if (current > document.body.offsetHeight - 8) this.fetchMore(); } } } diff --git a/src/client/app/desktop/views/home/favorites.vue b/src/client/app/desktop/views/home/favorites.vue index 4a4fc9ad8..951de9749 100644 --- a/src/client/app/desktop/views/home/favorites.vue +++ b/src/client/app/desktop/views/home/favorites.vue @@ -6,7 +6,7 @@ </template> </sequential-entrance> <div class="more" v-if="existMore"> - <ui-button inline @click="more">{{ $t('@.load-more') }}</ui-button> + <ui-button inline @click="fetchMore()">{{ $t('@.load-more') }}</ui-button> </div> </div> </template> @@ -48,7 +48,7 @@ export default Vue.extend({ Progress.done(); }); }, - more() { + fetchMore() { this.moreFetching = true; this.$root.api('i/favorites', { limit: 11, diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue index 58fc8a6bc..5f3f5633d 100644 --- a/src/client/app/mobile/views/components/notes.vue +++ b/src/client/app/mobile/views/components/notes.vue @@ -22,7 +22,7 @@ </component> <footer v-if="more"> - <button @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> + <button @click="fetchMore()" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> <template v-if="!moreFetching">{{ $t('@.load-more') }}</template> <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template> </button> @@ -123,7 +123,7 @@ export default Vue.extend({ }); }, - more() { + fetchMore() { if (!this.more || this.moreFetching) return; this.moreFetching = true; this.makePromise(this.notes[this.notes.length - 1].id).then(x => { @@ -181,7 +181,7 @@ export default Vue.extend({ if (this.$el.offsetHeight == 0) return; const current = window.scrollY + window.innerHeight; - if (current > document.body.offsetHeight - 8) this.more(); + if (current > document.body.offsetHeight - 8) this.fetchMore(); } } } diff --git a/src/client/app/mobile/views/pages/favorites.vue b/src/client/app/mobile/views/pages/favorites.vue index 196bd4b93..6f175a005 100644 --- a/src/client/app/mobile/views/pages/favorites.vue +++ b/src/client/app/mobile/views/pages/favorites.vue @@ -8,7 +8,7 @@ <mk-note-detail class="post" :note="favorite.note" :key="favorite.note.id"/> </template> </sequential-entrance> - <ui-button v-if="existMore" @click="more">{{ $t('@.load-more') }}</ui-button> + <ui-button v-if="existMore" @click="fetchMore()">{{ $t('@.load-more') }}</ui-button> </main> </mk-ui> </template> @@ -53,7 +53,7 @@ export default Vue.extend({ Progress.done(); }); }, - more() { + fetchMore() { this.moreFetching = true; this.$root.api('i/favorites', { limit: 11,