Improve usability

This commit is contained in:
syuilo
2018-09-01 09:16:25 +09:00
parent 4c6fb60dd2
commit 6819eb3b4d
11 changed files with 72 additions and 45 deletions

View File

@@ -48,7 +48,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
.mk-drive-file-chooser
position fixed
z-index 2048
z-index 20000
top 0
left 0
width 100%

View File

@@ -75,6 +75,13 @@
<div class="replies" v-if="!compact">
<x-sub v-for="note in replies" :key="note.id" :note="note"/>
</div>
<modal name="replyForm">
<mk-post-form @posted="replyFormClosed" @cancel="replyFormClosed" :reply="p"/>
</modal>
<modal name="renoteForm">
<mk-post-form @posted="renoteFormClosed" @cancel="renoteFormClosed" :renote="p"/>
</modal>
</div>
</template>
@@ -116,9 +123,11 @@ export default Vue.extend({
this.note.mediaIds.length == 0 &&
this.note.poll == null);
},
p(): any {
return this.isRenote ? this.note.renote : this.note;
},
reactionsCount(): number {
return this.p.reactionCounts
? Object.keys(this.p.reactionCounts)
@@ -126,6 +135,7 @@ export default Vue.extend({
.reduce((a, b) => a + b)
: 0;
},
urls(): string[] {
if (this.p.text) {
const ast = parse(this.p.text);
@@ -180,16 +190,23 @@ export default Vue.extend({
this.conversation = conversation.reverse();
});
},
reply() {
(this as any).apis.post({
reply: this.p
});
this.$modal.push('replyForm');
},
replyFormClosed() {
this.$modal.pop();
},
renote() {
(this as any).apis.post({
renote: this.p
});
this.$modal.push('renoteForm');
},
renoteFormClosed() {
this.$modal.pop();
},
react() {
(this as any).os.new(MkReactionPicker, {
source: this.$refs.reactButton,
@@ -198,6 +215,7 @@ export default Vue.extend({
big: true
});
},
menu() {
(this as any).os.new(MkNoteMenu, {
source: this.$refs.menuButton,

View File

@@ -60,6 +60,13 @@
</footer>
</div>
</article>
<modal name="replyForm">
<mk-post-form @posted="replyFormClosed" @cancel="replyFormClosed" :reply="p"/>
</modal>
<modal name="renoteForm">
<mk-post-form @posted="renoteFormClosed" @cancel="renoteFormClosed" :renote="p"/>
</modal>
</div>
</template>
@@ -195,15 +202,19 @@ export default Vue.extend({
},
reply() {
(this as any).apis.post({
reply: this.p
});
this.$modal.push('replyForm');
},
replyFormClosed() {
this.$modal.pop();
},
renote() {
(this as any).apis.post({
renote: this.p
});
this.$modal.push('renoteForm');
},
renoteFormClosed() {
this.$modal.pop();
},
react() {

View File

@@ -293,9 +293,6 @@ export default Vue.extend({
viaMobile: viaMobile
}).then(data => {
this.$emit('posted');
this.$nextTick(() => {
this.$destroy();
});
}).catch(err => {
this.posting = false;
});
@@ -309,7 +306,6 @@ export default Vue.extend({
cancel() {
this.$emit('cancel');
this.$destroy();
},
kao() {

View File

@@ -42,6 +42,10 @@
<mk-user-list-timeline v-if="src == 'list'" ref="tl" :key="list.id" :list="list"/>
</div>
</main>
<modal name="postForm">
<mk-post-form @posted="postFormClosed" @cancel="postFormClosed"/>
</modal>
</mk-ui>
</template>
@@ -107,7 +111,11 @@ export default Vue.extend({
methods: {
fn() {
(this as any).apis.post();
this.$modal.push('postForm');
},
postFormClosed() {
this.$modal.pop();
},
saveSrc() {