[Client:Desktop] Fix bug

2 files changed, 12 insertions, 14 deletions

diff --git a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
index 4ef4a2be43..ebc33d77da 100644
--- a/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
+++ b/src/web/app/desktop/tags/home-widgets/recommended-polls.tag
@@ -1,6 +1,6 @@
 <mk-recommended-polls-home-widget>
 	<p class="title"><i class="fa fa-pie-chart"></i>投票</p>
-	<button onclick={ refresh } title="他を見る"><i class="fa fa-refresh"></i></button>
+	<button onclick={ fetch } title="他を見る"><i class="fa fa-refresh"></i></button>
 	<div class="poll" if={ !loading && poll != null }>
 		<p class="text" if={ poll.text }>{ poll.text }</p>
 		<mk-poll post={ poll }></mk-poll>
@@ -87,17 +87,16 @@
 				offset: this.offset
 			}).then(posts => {
 				const poll = posts ? posts[0] : null;
-				if (poll == null) this.offset = 0;
+				if (post == null) {
+					this.offset = 0;
+				} else {
+					this.offset++;
+				}
 				this.update({
 					loading: false,
 					poll: poll
 				});
 			});
 		};
-
-		this.refresh = () => {
-			this.offset++;
-			this.fetch();
-		};
 	</script>
 </mk-recommended-polls-home-widget>
diff --git a/src/web/app/desktop/tags/home-widgets/trends.tag b/src/web/app/desktop/tags/home-widgets/trends.tag
index 0ad7729abd..a42d0b902e 100644
--- a/src/web/app/desktop/tags/home-widgets/trends.tag
+++ b/src/web/app/desktop/tags/home-widgets/trends.tag
@@ -1,6 +1,6 @@
 <mk-trends-home-widget>
 	<p class="title"><i class="fa fa-fire"></i>トレンド</p>
-	<button onclick={ refresh } title="他を見る"><i class="fa fa-refresh"></i></button>
+	<button onclick={ fetch } title="他を見る"><i class="fa fa-refresh"></i></button>
 	<div class="post" if={ !loading && post != null }>
 		<p class="text">{ post.text }</p>
 		<p class="author">―<a href="/{ post.user.username }">@{ post.user.username }</a></p>
@@ -96,17 +96,16 @@
 				poll: false
 			}).then(posts => {
 				const post = posts ? posts[0] : null;
-				if (post == null) this.offset = 0;
+				if (post == null) {
+					this.offset = 0;
+				} else {
+					this.offset++;
+				}
 				this.update({
 					loading: false,
 					post: post
 				});
 			});
 		};
-
-		this.refresh = () => {
-			this.offset++;
-			this.fetch();
-		};
 	</script>
 </mk-trends-home-widget>