From b44afc1876d297bf3bc3a307145bf69f0c852d18 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 17:39:23 +0900 Subject: [PATCH 1/7] =?UTF-8?q?iOS=E3=81=A7=E6=8A=95=E7=A8=BF=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AB=E8=87=AA=E5=8B=95=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=82=AB=E3=82=B9=E3=81=97=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/mobile/script.ts | 12 ++++++------ src/client/app/mobile/views/components/post-form.vue | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts index d33bafbb0..7a80f2175 100644 --- a/src/client/app/mobile/script.ts +++ b/src/client/app/mobile/script.ts @@ -25,6 +25,7 @@ import MkShare from '../common/views/pages/share.vue'; import MkFollow from '../common/views/pages/follow.vue'; import MkNotFound from '../common/views/pages/not-found.vue'; import DeckColumn from '../common/views/deck/deck.column-template.vue'; +import PostFormDialog from './views/components/post-form-dialog.vue'; import FileChooser from './views/components/drive-file-chooser.vue'; import FolderChooser from './views/components/drive-folder-chooser.vue'; @@ -50,16 +51,15 @@ init((launch, os) => { document.documentElement.style.overflow = 'auto'; } - this.$root.newAsync(() => import('./views/components/post-form-dialog.vue').then(m => m.default), { + const vm = this.$root.new(PostFormDialog, { reply: o.reply, mention: o.mention, renote: o.renote - }).then(vm => { - vm.$once('cancel', recover); - vm.$once('posted', recover); - if (o.cb) vm.$once('closed', o.cb); - (vm as any).focus(); }); + vm.$once('cancel', recover); + vm.$once('posted', recover); + if (o.cb) vm.$once('closed', o.cb); + (vm as any).focus(); }, $chooseDriveFile(opts) { diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 815122b28..85246036a 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -59,12 +59,11 @@ import { erase, unique } from '../../../../../prelude/array'; import { length } from 'stringz'; import { toASCII } from 'punycode'; import extractMentions from '../../../../../misc/extract-mentions'; -import XPostFormAttaches from '../../../common/views/components/post-form-attaches.vue'; export default Vue.extend({ i18n: i18n('mobile/views/components/post-form.vue'), components: { - XPostFormAttaches, + XPostFormAttaches: () => import('../../../common/views/components/post-form-attaches.vue').then(m => m.default), XPollEditor: () => import('../../../common/views/components/poll-editor.vue').then(m => m.default) }, From c8107ff93649b388f9643bb10ce8a5b8c9a292ae Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 17:40:58 +0900 Subject: [PATCH 2/7] :art: --- src/client/app/common/views/pages/user-groups.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/common/views/pages/user-groups.vue b/src/client/app/common/views/pages/user-groups.vue index 2fee46c3a..f5609d690 100644 --- a/src/client/app/common/views/pages/user-groups.vue +++ b/src/client/app/common/views/pages/user-groups.vue @@ -19,7 +19,7 @@
-
{{ group.name }}
+
{{ group.name }}
@@ -30,7 +30,7 @@
-
{{ invite.group.name }}
+
{{ invite.group.name }}
{{ $t('accept-invite') }} From 09da292f1a07e9c810615f5693f433ba7c7d2afe Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 17:43:27 +0900 Subject: [PATCH 3/7] Fix #4953 --- src/client/app/common/views/components/user-list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue index d6cf75001..466be4150 100644 --- a/src/client/app/common/views/components/user-list.vue +++ b/src/client/app/common/views/components/user-list.vue @@ -21,7 +21,7 @@
- From 19588647d6c820796818c6ff2e02a3a0803b34f5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 18:06:00 +0900 Subject: [PATCH 4/7] Improve usability --- src/client/app/desktop/views/components/ui-notification.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/components/ui-notification.vue b/src/client/app/desktop/views/components/ui-notification.vue index 10611fdf0..52e8e1d6c 100644 --- a/src/client/app/desktop/views/components/ui-notification.vue +++ b/src/client/app/desktop/views/components/ui-notification.vue @@ -29,7 +29,7 @@ export default Vue.extend({ easing: 'easeInElastic', complete: () => this.destroyDom() }); - }, 6000); + }, 5000); }); } }); @@ -52,6 +52,7 @@ export default Vue.extend({ box-shadow 0 2px 4px var(--desktopNotificationShadow) transform translateY(-64px) opacity 0 + pointer-events none > p margin 0 From d0cc145cb3929543c711874ae19b794cc1a0d2fa Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 18:08:58 +0900 Subject: [PATCH 5/7] Clean up --- src/client/app/desktop/views/home/tag.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue index b87dc1255..1c0beed42 100644 --- a/src/client/app/desktop/views/home/tag.vue +++ b/src/client/app/desktop/views/home/tag.vue @@ -35,12 +35,10 @@ export default Vue.extend({ }, mounted() { document.addEventListener('keydown', this.onDocumentKeydown); - window.addEventListener('scroll', this.onScroll, { passive: true }); Progress.start(); }, beforeDestroy() { document.removeEventListener('keydown', this.onDocumentKeydown); - window.removeEventListener('scroll', this.onScroll); }, methods: { onDocumentKeydown(e) { From 08b6fda0651d48543507241e548ed30acd832a89 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 21 May 2019 18:09:05 +0900 Subject: [PATCH 6/7] Fix bug --- src/client/app/desktop/views/components/notes.vue | 4 ++++ src/client/app/desktop/views/home/tag.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index cb8b9c3ce..0820d5d80 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -73,6 +73,10 @@ export default Vue.extend({ sound.play(); } } + }, + + onInited: (self) => { + self.$emit('loaded'); } }), ], diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue index 1c0beed42..dd4be06a5 100644 --- a/src/client/app/desktop/views/home/tag.vue +++ b/src/client/app/desktop/views/home/tag.vue @@ -1,6 +1,6 @@