From 17677e00f282d9d6758d8b8307b5b47043bcc7df Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 25 Mar 2017 23:47:27 +0900
Subject: [PATCH] [Client:Desktop] Fix bug

---
 package.json                                        |  2 +-
 .../desktop/tags/home-widgets/recommended-polls.tag | 13 ++++++-------
 src/web/app/desktop/tags/home-widgets/trends.tag    | 13 ++++++-------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 17eba0a4b..2012a7cbb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "misskey",
   "author": "syuilo <i@syuilo.com>",
-  "version": "0.0.1475",
+  "version": "0.0.1479",
   "license": "MIT",
   "description": "A miniblog-based SNS",
   "bugs": "https://github.com/syuilo/misskey/issues",
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 4ef4a2be4..ebc33d77d 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 0ad7729ab..a42d0b902 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>