graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 15:43:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/client/app/mobile/views/components/note-detail.vue
View file

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

13
src/client/app/mobile/views/components/note.vue
View file

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