Skip to content

Commit

Permalink
Fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
syuilo committed Sep 1, 2018
1 parent 8ee771c commit 63e2dbb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
13 changes: 8 additions & 5 deletions src/client/app/mobile/views/components/note-detail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,18 @@
<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>
</template>

<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';
Expand All @@ -112,7 +113,9 @@ export default Vue.extend({
return {
conversation: [],
conversationFetching: false,
replies: []
replies: [],
replyFormId: uuid(),
renoteFormId: uuid()
};
},
Expand Down Expand Up @@ -192,15 +195,15 @@ export default Vue.extend({
},
reply() {
this.$modal.push('replyForm');
this.$modal.push(this.replyFormId);
},
replyFormClosed() {
this.$modal.pop();
},
renote() {
this.$modal.push('renoteForm');
this.$modal.push(this.renoteFormId);
},
renoteFormClosed() {
Expand Down
13 changes: 8 additions & 5 deletions src/client/app/mobile/views/components/note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,18 @@
</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>
</template>

<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';
Expand All @@ -89,7 +90,9 @@ export default Vue.extend({
return {
showContent: false,
connection: null,
connectionId: null
connectionId: null,
replyFormId: uuid(),
renoteFormId: uuid()
};
},
Expand Down Expand Up @@ -202,15 +205,15 @@ export default Vue.extend({
},
reply() {
this.$modal.push('replyForm');
this.$modal.push(this.replyFormId);
},
replyFormClosed() {
this.$modal.pop();
},
renote() {
this.$modal.push('renoteForm');
this.$modal.push(this.renoteFormId);
},
renoteFormClosed() {
Expand Down

0 comments on commit 63e2dbb

Please sign in to comment.