Merge branch 'develop'

7 files changed, 17 insertions, 15 deletions

diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
index d6cf750016..466be41506 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 @@
 				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
 		</div>
-		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMoreUsers()" :disabled="moreFetching">
+		<button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching">
 			<template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }}
 		</button>
 	</div>
diff --git a/src/client/app/common/views/pages/user-groups.vue b/src/client/app/common/views/pages/user-groups.vue
index 2fee46c3a1..f5609d690d 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 @@
 		<div class="hwgkdrbl" v-for="(group, i) in joinedGroups" :key="group.id">
 			<ui-hr v-if="i != 0"/>
 			<ui-margin>
-				<div>{{ group.name }}</div>
+				<div style="color:var(--text);">{{ group.name }}</div>
 				<x-avatars :user-ids="group.userIds" style="margin-top:8px;"/>
 			</ui-margin>
 		</div>
@@ -30,7 +30,7 @@
 		<div class="fvlojuur" v-for="(invite, i) in invites" :key="invite.id">
 			<ui-hr v-if="i != 0"/>
 			<ui-margin>
-				<div class="name">{{ invite.group.name }}</div>
+				<div class="name" style="color:var(--text);">{{ invite.group.name }}</div>
 				<x-avatars :user-ids="invite.group.userIds" style="margin-top:8px;"/>
 				<ui-horizon-group>
 					<ui-button @click="acceptInvite(invite)"><fa :icon="faCheck"/> {{ $t('accept-invite') }}</ui-button>
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index cb8b9c3ce3..0820d5d80c 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/components/ui-notification.vue b/src/client/app/desktop/views/components/ui-notification.vue
index 10611fdf02..52e8e1d6cb 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
diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue
index b87dc1255d..dd4be06a53 100644
--- a/src/client/app/desktop/views/home/tag.vue
+++ b/src/client/app/desktop/views/home/tag.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-	<mk-notes ref="timeline" :pagination="pagination" @inited="inited">
+	<mk-notes ref="timeline" :pagination="pagination" @loaded="inited">
 		<template #header>
 			<header class="wqraeznr">
 				<span><fa icon="hashtag"/> {{ $route.params.tag }}</span>
@@ -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) {
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index d33bafbb0f..7a80f21759 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 815122b28e..85246036a2 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)
 	},