This commit is contained in:
syuilo 2018-09-01 15:22:28 +09:00
parent 8ee771ca77
commit 63e2dbbb0d
2 changed files with 16 additions and 10 deletions

View File

@ -76,10 +76,10 @@
<x-sub v-for="note in replies" :key="note.id" :note="note"/>
</div>
<modal name="replyForm">
<modal :name="replyFormId">
<mk-post-form @posted="replyFormClosed" @cancel="replyFormClosed" :reply="p"/>
</modal>
<modal name="renoteForm">
<modal :name="renoteFormId">
<mk-post-form @posted="renoteFormClosed" @cancel="renoteFormClosed" :renote="p"/>
</modal>
</div>
@ -87,6 +87,7 @@
<script lang="ts">
import Vue from 'vue';
import * as uuid from 'uuid';
import parse from '../../../../../mfm/parse';
import MkNoteMenu from '../../../common/views/components/note-menu.vue';
@ -112,7 +113,9 @@ export default Vue.extend({
return {
conversation: [],
conversationFetching: false,
replies: []
replies: [],
replyFormId: uuid(),
renoteFormId: uuid()
};
},
@ -192,7 +195,7 @@ export default Vue.extend({
},
reply() {
this.$modal.push('replyForm');
this.$modal.push(this.replyFormId);
},
replyFormClosed() {
@ -200,7 +203,7 @@ export default Vue.extend({
},
renote() {
this.$modal.push('renoteForm');
this.$modal.push(this.renoteFormId);
},
renoteFormClosed() {

View File

@ -61,10 +61,10 @@
</div>
</article>
<modal name="replyForm">
<modal :name="replyFormId">
<mk-post-form @posted="replyFormClosed" @cancel="replyFormClosed" :reply="p"/>
</modal>
<modal name="renoteForm">
<modal :name="renoteFormId">
<mk-post-form @posted="renoteFormClosed" @cancel="renoteFormClosed" :renote="p"/>
</modal>
</div>
@ -72,6 +72,7 @@
<script lang="ts">
import Vue from 'vue';
import * as uuid from 'uuid';
import parse from '../../../../../mfm/parse';
import MkNoteMenu from '../../../common/views/components/note-menu.vue';
@ -89,7 +90,9 @@ export default Vue.extend({
return {
showContent: false,
connection: null,
connectionId: null
connectionId: null,
replyFormId: uuid(),
renoteFormId: uuid()
};
},
@ -202,7 +205,7 @@ export default Vue.extend({
},
reply() {
this.$modal.push('replyForm');
this.$modal.push(this.replyFormId);
},
replyFormClosed() {
@ -210,7 +213,7 @@ export default Vue.extend({
},
renote() {
this.$modal.push('renoteForm');
this.$modal.push(this.renoteFormId);
},
renoteFormClosed() {