From ec63c3463ad7a7eb5fdaa92519c754a1f5408d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?=
<syuilotan@yahoo.co.jp>
Date: Fri, 16 Feb 2018 13:11:54 +0900
Subject: [PATCH] wip
---
src/web/app/mobile/tags/page/user.tag | 27 -------------------------
src/web/app/mobile/views/pages/user.vue | 10 +++++++--
2 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 src/web/app/mobile/tags/page/user.tag
diff --git a/src/web/app/mobile/tags/page/user.tag b/src/web/app/mobile/tags/page/user.tag
deleted file mode 100644
index 3af11bbb4d..0000000000
--- a/src/web/app/mobile/tags/page/user.tag
+++ /dev/null
@@ -1,27 +0,0 @@
-<mk-user-page>
- <mk-ui ref="ui">
- <mk-user ref="user" user={ parent.user } page={ parent.opts.page }/>
- </mk-ui>
- <style lang="stylus" scoped>
- :scope
- display block
- </style>
- <script lang="typescript">
- import ui from '../../scripts/ui-event';
- import Progress from '../../../common/scripts/loading';
-
- this.user = this.opts.user;
-
- this.on('mount', () => {
- document.documentElement.style.background = '#313a42';
- Progress.start();
-
- this.$refs.ui.refs.user.on('loaded', user => {
- Progress.done();
- document.title = user.name + ' | Misskey';
- // TODO: ユーザー名をエスケープ
- ui.trigger('title', '%fa:user%' + user.name);
- });
- });
- </script>
-</mk-user-page>
diff --git a/src/web/app/mobile/views/pages/user.vue b/src/web/app/mobile/views/pages/user.vue
index d92f3bbe65..4cc152c1ed 100644
--- a/src/web/app/mobile/views/pages/user.vue
+++ b/src/web/app/mobile/views/pages/user.vue
@@ -1,6 +1,6 @@
<template>
<mk-ui :func="fn" func-icon="%fa:pencil-alt%">
- <span slot="header">%fa:user% {{user.name}}</span>
+ <span slot="header" v-if="!fetching">%fa:user% {{user.name}}</span>
<div v-if="!fetching" :class="$style.user">
<header>
<div class="banner" :style="user.banner_url ? `background-image: url(${user.banner_url}?thumbnail&size=1024)` : ''"></div>
@@ -58,6 +58,7 @@
<script lang="ts">
import Vue from 'vue';
const age = require('s-age');
+import Progress from '../../../common/scripts/loading';
export default Vue.extend({
props: {
@@ -81,12 +82,17 @@ export default Vue.extend({
}
},
mounted() {
+ document.documentElement.style.background = '#313a42';
+ Progress.start();
+
this.$root.$data.os.api('users/show', {
username: this.username
}).then(user => {
this.fetching = false;
this.user = user;
- this.$emit('loaded', user);
+
+ Progress.done();
+ document.title = user.name + ' | Misskey';
});
}
});