From 3a39a36bedad75a134127823bbd12af2907ee24a Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 20 Feb 2017 16:27:24 +0900 Subject: [PATCH] wip --- src/web/app/common/tags/messaging/room.tag | 2 +- src/web/app/desktop/tags/pages/home.tag | 6 +-- src/web/app/desktop/tags/user-timeline.tag | 6 +-- src/web/app/mobile/tags/drive-selector.tag | 15 +++++--- src/web/app/mobile/tags/page/drive.tag | 37 +++++++++++-------- src/web/app/mobile/tags/page/entrance.tag | 20 ++++++---- .../app/mobile/tags/page/entrance/signup.tag | 4 -- src/web/app/mobile/tags/page/home.tag | 34 ++++++++++------- .../app/mobile/tags/page/messaging-room.tag | 15 +++++--- src/web/app/mobile/tags/page/messaging.tag | 9 +++-- src/web/app/mobile/tags/page/new-post.tag | 5 --- .../app/mobile/tags/page/notifications.tag | 4 +- src/web/app/mobile/tags/page/post.tag | 7 +++- src/web/app/mobile/tags/page/search.tag | 7 ++-- src/web/app/mobile/tags/page/settings.tag | 3 +- src/web/app/mobile/tags/page/settings/api.tag | 3 +- .../tags/page/settings/authorized-apps.tag | 3 +- .../app/mobile/tags/page/settings/signin.tag | 3 +- .../app/mobile/tags/page/settings/twitter.tag | 3 +- .../app/mobile/tags/page/user-followers.tag | 20 +++++----- .../app/mobile/tags/page/user-following.tag | 20 +++++----- src/web/app/mobile/tags/page/user.tag | 10 +++-- 22 files changed, 136 insertions(+), 100 deletions(-) diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag index f8088470ea..8b1220e29a 100644 --- a/src/web/app/common/tags/messaging/room.tag +++ b/src/web/app/common/tags/messaging/room.tag @@ -226,7 +226,7 @@ , 4000ms }; - this.on-visibilitychange = () => { + this.onVisibilitychange = () => { if document.hidden then return @messages.forEach (message) => if message.user_id != this.I.id and not message.is_read diff --git a/src/web/app/desktop/tags/pages/home.tag b/src/web/app/desktop/tags/pages/home.tag index 4ed74a373d..433137e9cb 100644 --- a/src/web/app/desktop/tags/pages/home.tag +++ b/src/web/app/desktop/tags/pages/home.tag @@ -28,18 +28,18 @@ document.title = 'Misskey' this.Progress.start(); this.stream.on 'post' this.on-stream-post - document.addEventListener 'visibilitychange' @window-on-visibilitychange, false + document.addEventListener 'visibilitychange' @window-onVisibilitychange, false this.on('unmount', () => { this.stream.off 'post' this.on-stream-post - document.removeEventListener 'visibilitychange' @window-on-visibilitychange + document.removeEventListener 'visibilitychange' @window-onVisibilitychange this.on-stream-post = (post) => { if document.hidden and post.user_id !== this.I.id @unread-count++ document.title = '(' + @unread-count + ') ' + @get-post-summary post - this.window-on-visibilitychange = () => { + this.window-onVisibilitychange = () => { if !document.hidden this.unread-count = 0 document.title = 'Misskey' diff --git a/src/web/app/desktop/tags/user-timeline.tag b/src/web/app/desktop/tags/user-timeline.tag index acced7fc3d..bc2e1744ef 100644 --- a/src/web/app/desktop/tags/user-timeline.tag +++ b/src/web/app/desktop/tags/user-timeline.tag @@ -59,7 +59,7 @@ this.mode = 'default' this.on('mount', () => { - document.addEventListener 'visibilitychange' @window-on-visibilitychange, false + document.addEventListener 'visibilitychange' @window-onVisibilitychange, false document.addEventListener 'keydown' this.on-document-keydown window.addEventListener 'scroll' this.on-scroll @@ -71,7 +71,7 @@ this.trigger('loaded'); this.on('unmount', () => { - document.removeEventListener 'visibilitychange' @window-on-visibilitychange + document.removeEventListener 'visibilitychange' @window-onVisibilitychange document.removeEventListener 'keydown' this.on-document-keydown window.removeEventListener 'scroll' this.on-scroll @@ -120,7 +120,7 @@ @unread-count++ document.title = '(' + @unread-count + ') ' + @get-post-summary post - this.window-on-visibilitychange = () => { + this.window-onVisibilitychange = () => { if !document.hidden this.unread-count = 0 document.title = 'Misskey' diff --git a/src/web/app/mobile/tags/drive-selector.tag b/src/web/app/mobile/tags/drive-selector.tag index 873c491542..753a2c3a9b 100644 --- a/src/web/app/mobile/tags/drive-selector.tag +++ b/src/web/app/mobile/tags/drive-selector.tag @@ -56,19 +56,24 @@ diff --git a/src/web/app/mobile/tags/page/drive.tag b/src/web/app/mobile/tags/page/drive.tag index c3e16a704e..c4cc64261f 100644 --- a/src/web/app/mobile/tags/page/drive.tag +++ b/src/web/app/mobile/tags/page/drive.tag @@ -5,57 +5,64 @@ diff --git a/src/web/app/mobile/tags/page/entrance.tag b/src/web/app/mobile/tags/page/entrance.tag index 1197d0578e..452dff992e 100644 --- a/src/web/app/mobile/tags/page/entrance.tag +++ b/src/web/app/mobile/tags/page/entrance.tag @@ -43,18 +43,24 @@ diff --git a/src/web/app/mobile/tags/page/entrance/signup.tag b/src/web/app/mobile/tags/page/entrance/signup.tag index 5209543886..c4b3ee9f38 100644 --- a/src/web/app/mobile/tags/page/entrance/signup.tag +++ b/src/web/app/mobile/tags/page/entrance/signup.tag @@ -34,9 +34,5 @@ > i padding 14px - - - - diff --git a/src/web/app/mobile/tags/page/home.tag b/src/web/app/mobile/tags/page/home.tag index ac00800a16..c93803fb02 100644 --- a/src/web/app/mobile/tags/page/home.tag +++ b/src/web/app/mobile/tags/page/home.tag @@ -5,7 +5,6 @@ diff --git a/src/web/app/mobile/tags/page/messaging-room.tag b/src/web/app/mobile/tags/page/messaging-room.tag index 934a7f8771..29657802a6 100644 --- a/src/web/app/mobile/tags/page/messaging-room.tag +++ b/src/web/app/mobile/tags/page/messaging-room.tag @@ -10,18 +10,21 @@ this.mixin('api'); this.mixin('ui'); - this.fetching = true + this.fetching = true; this.on('mount', () => { this.api('users/show', { username: this.opts.username }).then(user => { - this.fetching = false - this.user = user - this.update(); + this.update({ + fetching: false, + user: user + }); - document.title = 'メッセージ: ' + user.name + ' | Misskey' + document.title = `メッセージ: ${user.name} | Misskey`; // TODO: ユーザー名をエスケープ - this.ui.trigger('title', ''); + user.name + this.ui.trigger('title', '' + user.name); + }); + }); diff --git a/src/web/app/mobile/tags/page/messaging.tag b/src/web/app/mobile/tags/page/messaging.tag index 78a2ca9917..fd94cbfa4a 100644 --- a/src/web/app/mobile/tags/page/messaging.tag +++ b/src/web/app/mobile/tags/page/messaging.tag @@ -11,11 +11,12 @@ this.mixin('page'); this.on('mount', () => { - document.title = 'Misskey | メッセージ' + document.title = 'Misskey | メッセージ'; this.ui.trigger('title', 'メッセージ'); - this.refs.ui.refs.index.on('navigate-user', (user) => { - this.page '/i/messaging/' + user.username - + this.refs.ui.refs.index.on('navigate-user', user => { + this.page('/i/messaging/' + user.username); + }); + }); diff --git a/src/web/app/mobile/tags/page/new-post.tag b/src/web/app/mobile/tags/page/new-post.tag index e323f0d955..3ba549c8dc 100644 --- a/src/web/app/mobile/tags/page/new-post.tag +++ b/src/web/app/mobile/tags/page/new-post.tag @@ -3,10 +3,5 @@ diff --git a/src/web/app/mobile/tags/page/notifications.tag b/src/web/app/mobile/tags/page/notifications.tag index b33386fb85..1d35d79edc 100644 --- a/src/web/app/mobile/tags/page/notifications.tag +++ b/src/web/app/mobile/tags/page/notifications.tag @@ -12,12 +12,14 @@ this.mixin('ui-progress'); this.on('mount', () => { - document.title = 'Misskey | 通知' + document.title = 'Misskey | 通知'; this.ui.trigger('title', '通知'); this.Progress.start(); this.refs.ui.refs.notifications.on('loaded', () => { this.Progress.done(); + }); + }); diff --git a/src/web/app/mobile/tags/page/post.tag b/src/web/app/mobile/tags/page/post.tag index 69a24c5528..2c4eba37a0 100644 --- a/src/web/app/mobile/tags/page/post.tag +++ b/src/web/app/mobile/tags/page/post.tag @@ -21,18 +21,21 @@ this.mixin('ui'); this.mixin('ui-progress'); - this.post = this.opts.post + this.post = this.opts.post; this.on('mount', () => { - document.title = 'Misskey' + document.title = 'Misskey'; this.ui.trigger('title', '投稿'); this.Progress.start(); this.refs.ui.refs.post.on('post-fetched', () => { this.Progress.set(0.5); + }); this.refs.ui.refs.post.on('loaded', () => { this.Progress.done(); + }); + }); diff --git a/src/web/app/mobile/tags/page/search.tag b/src/web/app/mobile/tags/page/search.tag index 4dde50ab8d..fbf741f2e6 100644 --- a/src/web/app/mobile/tags/page/search.tag +++ b/src/web/app/mobile/tags/page/search.tag @@ -5,20 +5,21 @@ diff --git a/src/web/app/mobile/tags/page/settings.tag b/src/web/app/mobile/tags/page/settings.tag index 5e06a302ee..59974e8cb6 100644 --- a/src/web/app/mobile/tags/page/settings.tag +++ b/src/web/app/mobile/tags/page/settings.tag @@ -16,7 +16,8 @@ this.mixin('ui'); this.on('mount', () => { - document.title = 'Misskey | 設定' + document.title = 'Misskey | 設定'; this.ui.trigger('title', '設定'); + }); diff --git a/src/web/app/mobile/tags/page/settings/api.tag b/src/web/app/mobile/tags/page/settings/api.tag index 039792c0a8..e4f954f51a 100644 --- a/src/web/app/mobile/tags/page/settings/api.tag +++ b/src/web/app/mobile/tags/page/settings/api.tag @@ -10,7 +10,8 @@ this.mixin('ui'); this.on('mount', () => { - document.title = 'Misskey | API' + document.title = 'Misskey | API'; this.ui.trigger('title', 'API'); + }); diff --git a/src/web/app/mobile/tags/page/settings/authorized-apps.tag b/src/web/app/mobile/tags/page/settings/authorized-apps.tag index 1415f11d0a..84904c91e5 100644 --- a/src/web/app/mobile/tags/page/settings/authorized-apps.tag +++ b/src/web/app/mobile/tags/page/settings/authorized-apps.tag @@ -10,7 +10,8 @@ this.mixin('ui'); this.on('mount', () => { - document.title = 'Misskey | アプリケーション' + document.title = 'Misskey | アプリケーション'; this.ui.trigger('title', 'アプリケーション'); + }); diff --git a/src/web/app/mobile/tags/page/settings/signin.tag b/src/web/app/mobile/tags/page/settings/signin.tag index 092cd64419..874cdf4856 100644 --- a/src/web/app/mobile/tags/page/settings/signin.tag +++ b/src/web/app/mobile/tags/page/settings/signin.tag @@ -10,7 +10,8 @@ this.mixin('ui'); this.on('mount', () => { - document.title = 'Misskey | ログイン履歴' + document.title = 'Misskey | ログイン履歴'; this.ui.trigger('title', 'ログイン履歴'); + }); diff --git a/src/web/app/mobile/tags/page/settings/twitter.tag b/src/web/app/mobile/tags/page/settings/twitter.tag index 87550efe28..2026ab7daf 100644 --- a/src/web/app/mobile/tags/page/settings/twitter.tag +++ b/src/web/app/mobile/tags/page/settings/twitter.tag @@ -10,7 +10,8 @@ this.mixin('ui'); this.on('mount', () => { - document.title = 'Misskey | Twitter連携' + document.title = 'Misskey | Twitter連携'; this.ui.trigger('title', 'Twitter連携'); + }); diff --git a/src/web/app/mobile/tags/page/user-followers.tag b/src/web/app/mobile/tags/page/user-followers.tag index 75a2c5d279..249897be2c 100644 --- a/src/web/app/mobile/tags/page/user-followers.tag +++ b/src/web/app/mobile/tags/page/user-followers.tag @@ -5,15 +5,14 @@ diff --git a/src/web/app/mobile/tags/page/user-following.tag b/src/web/app/mobile/tags/page/user-following.tag index 44a054e822..a682715a02 100644 --- a/src/web/app/mobile/tags/page/user-following.tag +++ b/src/web/app/mobile/tags/page/user-following.tag @@ -5,15 +5,14 @@ diff --git a/src/web/app/mobile/tags/page/user.tag b/src/web/app/mobile/tags/page/user.tag index 4215ca2c35..2a0e48426f 100644 --- a/src/web/app/mobile/tags/page/user.tag +++ b/src/web/app/mobile/tags/page/user.tag @@ -11,15 +11,17 @@ this.mixin('ui'); this.mixin('ui-progress'); - this.user = this.opts.user + this.user = this.opts.user; this.on('mount', () => { this.Progress.start(); - this.refs.ui.refs.user.on('loaded', (user) => { + this.refs.ui.refs.user.on('loaded', user => { this.Progress.done(); - document.title = user.name + ' | Misskey' + document.title = user.name + ' | Misskey'; // TODO: ユーザー名をエスケープ - this.ui.trigger('title', ''); + user.name + this.ui.trigger('title', '' + user.name); + }); + });