summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-11-01 16:48:00 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-11-01 16:48:00 +0900
commitb65e038686913812a1e6ddf7e1288337c6fe5fe7 (patch)
tree533f7c9b4eb4b2532374202285faaf0bb3b7bf5b /src/web
parentv2795 (diff)
downloadmisskey-b65e038686913812a1e6ddf7e1288337c6fe5fe7.tar.gz
misskey-b65e038686913812a1e6ddf7e1288337c6fe5fe7.tar.bz2
misskey-b65e038686913812a1e6ddf7e1288337c6fe5fe7.zip
Better progress bar
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/ch/tags/channel.tag18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag
index fdc9ab4cef..c6921e1a5c 100644
--- a/src/web/app/ch/tags/channel.tag
+++ b/src/web/app/ch/tags/channel.tag
@@ -51,10 +51,18 @@
Progress.start();
+ const fetched = false;
+
+ // チャンネル概要読み込み
this.api('channels/show', {
channel_id: this.id
}).then(channel => {
- Progress.done();
+ if (fetched) {
+ Progress.done();
+ } else {
+ Progress.set(0.5);
+ fetched = true;
+ }
this.update({
fetching: false,
@@ -64,9 +72,17 @@
document.title = channel.title + ' | Misskey'
});
+ // 投稿読み込み
this.api('channels/posts', {
channel_id: this.id
}).then(posts => {
+ if (fetched) {
+ Progress.done();
+ } else {
+ Progress.set(0.5);
+ fetched = true;
+ }
+
this.update({
postsFetching: false,
posts: posts