Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[Client:Desktop] Fix bug

Browse source
This commit is contained in:
syuilo 2017-03-25 23:47:27 +09:00
parent e6e63f0679
commit 17677e00f2
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "0.0.1475", "version": "0.0.1479",
"license": "MIT", "license": "MIT",
"description": "A miniblog-based SNS", "description": "A miniblog-based SNS",
"bugs": "https://github.com/syuilo/misskey/issues", "bugs": "https://github.com/syuilo/misskey/issues",

13
src/web/app/desktop/tags/home-widgets/recommended-polls.tag
View file

@ -1,6 +1,6 @@
<mk-recommended-polls-home-widget> <mk-recommended-polls-home-widget>
<p class="title"><i class="fa fa-pie-chart"></i>投票</p> <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 }> <div class="poll" if={ !loading && poll != null }>
<p class="text" if={ poll.text }>{ poll.text }</p> <p class="text" if={ poll.text }>{ poll.text }</p>
<mk-poll post={ poll }></mk-poll> <mk-poll post={ poll }></mk-poll>
@ -87,17 +87,16 @@
offset: this.offset offset: this.offset
}).then(posts => { }).then(posts => {
const poll = posts ? posts[0] : null; const poll = posts ? posts[0] : null;
if (poll == null) this.offset = 0; if (post == null) {
this.offset = 0;
} else {
this.offset++;
}
this.update({ this.update({
loading: false, loading: false,
poll: poll poll: poll
}); });
}); });
}; };
this.refresh = () => {
this.offset++;
this.fetch();
};
</script> </script>
</mk-recommended-polls-home-widget> </mk-recommended-polls-home-widget>

13
src/web/app/desktop/tags/home-widgets/trends.tag
View file

@ -1,6 +1,6 @@
<mk-trends-home-widget> <mk-trends-home-widget>
<p class="title"><i class="fa fa-fire"></i>トレンド</p> <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 }> <div class="post" if={ !loading && post != null }>
<p class="text">{ post.text }</p> <p class="text">{ post.text }</p>
<p class="author">―<a href="/{ post.user.username }">@{ post.user.username }</a></p> <p class="author">―<a href="/{ post.user.username }">@{ post.user.username }</a></p>
@ -96,17 +96,16 @@
poll: false poll: false
}).then(posts => { }).then(posts => {
const post = posts ? posts[0] : null; const post = posts ? posts[0] : null;
if (post == null) this.offset = 0; if (post == null) {
this.offset = 0;
} else {
this.offset++;
}
this.update({ this.update({
loading: false, loading: false,
post: post post: post
}); });
}); });
}; };
this.refresh = () => {
this.offset++;
this.fetch();
};
</script> </script>
</mk-trends-home-widget> </mk-trends-home-widget>