Merge branch '250-file-upload-acceptable-file' into 'dev'
fix for file upload acceptable file type See merge request keanuapp/keanuapp-weblite!158
This commit is contained in:
commit
d86ee3b1e3
1 changed files with 4 additions and 4 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="chat-root fill-height d-flex flex-column">
|
<div class="chat-root fill-height d-flex flex-column">
|
||||||
<ChatHeader class="chat-header flex-grow-0 flex-shrink-0" v-on:header-click="onHeaderClick" v-on:view-room-details="viewRoomDetails" />
|
<ChatHeader class="chat-header flex-grow-0 flex-shrink-0" v-on:header-click="onHeaderClick" v-on:view-room-details="viewRoomDetails" />
|
||||||
<AudioLayout ref="chatContainer" class="auto-audio-player-root" v-if="useVoiceMode" :room="room"
|
<AudioLayout ref="chatContainer" class="auto-audio-player-root" v-if="useVoiceMode" :room="room"
|
||||||
:events="events" :autoplay="!showRecorder"
|
:events="events" :autoplay="!showRecorder"
|
||||||
:timelineSet="timelineSet"
|
:timelineSet="timelineSet"
|
||||||
:readMarker="readMarker"
|
:readMarker="readMarker"
|
||||||
:recordingMembers="typingMembers"
|
:recordingMembers="typingMembers"
|
||||||
|
|
@ -181,7 +181,7 @@
|
||||||
</v-container>
|
</v-container>
|
||||||
|
|
||||||
<input ref="attachment" type="file" name="attachment" @change="handlePickedAttachment($event)"
|
<input ref="attachment" type="file" name="attachment" @change="handlePickedAttachment($event)"
|
||||||
accept="image/*|audio/*|video/*|application/pdf" class="d-none" />
|
accept="image/*, audio/*, video/*, .pdf" class="d-none" />
|
||||||
|
|
||||||
<div v-if="currentImageInputPath">
|
<div v-if="currentImageInputPath">
|
||||||
<v-dialog v-model="currentImageInputPath" class="ma-0 pa-0" :width="$vuetify.breakpoint.smAndUp ? '50%' : '85%'">
|
<v-dialog v-model="currentImageInputPath" class="ma-0 pa-0" :width="$vuetify.breakpoint.smAndUp ? '50%' : '85%'">
|
||||||
|
|
@ -1453,9 +1453,9 @@ export default {
|
||||||
}, 3000);
|
}, 3000);
|
||||||
},
|
},
|
||||||
setShowRecorder() {
|
setShowRecorder() {
|
||||||
if (this.canRecordAudio) {
|
if (this.canRecordAudio) {
|
||||||
this.showRecorder = true;
|
this.showRecorder = true;
|
||||||
} else {
|
} else {
|
||||||
this.showNoRecordingAvailableDialog = true;
|
this.showNoRecordingAvailableDialog = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue