Merge pull request #792 from traPtitech/fix/upload-while-upload

アップロード中に送信ボタンが押せてた
traPtitech · May 5, 2020 · 6428da1 · 6428da1
2 parents da96832 + a482c11
commit 6428da1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/components/Main/MainView/MessageElement/MessageFileListImage.vue b/src/components/Main/MainView/MessageElement/MessageFileListImage.vue
@@ -57,6 +57,7 @@ export default defineComponent({
   border: {
     width: 2px;
     style: solid;
+    color: $theme-background-secondary;
   }
   max-width: min(600px, 100%);
   img {

diff --git a/src/components/Main/MainView/MessageInput/use/postMessage.ts b/src/components/Main/MainView/MessageInput/use/postMessage.ts
@@ -62,13 +62,14 @@ const usePostMessage = (
     })
 
     try {
+      isPosting.value = true
+
       const fileUrls = await uploadAttachments(
         store.state.ui.fileInput.attachments,
         props.channelId
       )
       const embededdUrls = fileUrls.join('\n')
 
-      isPosting.value = true
       await apis.postMessage(props.channelId, {
         content: embededText + (embededdUrls ? '\n' + embededdUrls : '')
       })