From e4120e930c97f26d4bc344e9135588be094a0306 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 21 Feb 2018 01:12:18 +0900
Subject: [PATCH] wip
---
src/web/app/desktop/views/components/home.vue | 6 +++---
src/web/app/desktop/views/components/timeline.vue | 1 +
src/web/app/desktop/views/pages/home.vue | 6 +++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/web/app/desktop/views/components/home.vue b/src/web/app/desktop/views/components/home.vue
index e815239d3..8e64a2d83 100644
--- a/src/web/app/desktop/views/components/home.vue
+++ b/src/web/app/desktop/views/components/home.vue
@@ -10,15 +10,15 @@
<option value="calendar">カレンダー</option>
<option value="timemachine">カレンダー(タイムマシン)</option>
<option value="activity">アクティビティ</option>
- <option value="rss-reader">RSSリーダー</option>
+ <option value="rss">RSSリーダー</option>
<option value="trends">トレンド</option>
<option value="photo-stream">フォトストリーム</option>
<option value="slideshow">スライドショー</option>
<option value="version">バージョン</option>
<option value="broadcast">ブロードキャスト</option>
<option value="notifications">通知</option>
- <option value="user-recommendation">おすすめユーザー</option>
- <option value="recommended-polls">投票</option>
+ <option value="users">おすすめユーザー</option>
+ <option value="polls">投票</option>
<option value="post-form">投稿フォーム</option>
<option value="messaging">メッセージ</option>
<option value="channel">チャンネル</option>
diff --git a/src/web/app/desktop/views/components/timeline.vue b/src/web/app/desktop/views/components/timeline.vue
index 875a7961e..a3f27412d 100644
--- a/src/web/app/desktop/views/components/timeline.vue
+++ b/src/web/app/desktop/views/components/timeline.vue
@@ -59,6 +59,7 @@ export default Vue.extend({
}).then(posts => {
this.posts = posts;
this.fetching = false;
+ this.$emit('loaded');
if (cb) cb();
});
},
diff --git a/src/web/app/desktop/views/pages/home.vue b/src/web/app/desktop/views/pages/home.vue
index e19b7fc8f..e1464bab1 100644
--- a/src/web/app/desktop/views/pages/home.vue
+++ b/src/web/app/desktop/views/pages/home.vue
@@ -1,6 +1,6 @@
<template>
<mk-ui>
- <mk-home :mode="mode"/>
+ <mk-home :mode="mode" @loaded="loaded"/>
</mk-ui>
</template>
@@ -40,6 +40,10 @@ export default Vue.extend({
document.removeEventListener('visibilitychange', this.onVisibilitychange);
},
methods: {
+ loaded() {
+ Progress.done();
+ },
+
onStreamPost(post) {
if (document.hidden && post.user_id != (this as any).os.i.id) {
this.unreadCount++;