Merge pull request #1351 from Bilb/hide-microphone

pull/1352/head
Audric Ackermann 5 years ago committed by GitHub
commit f487489b3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -105,7 +105,7 @@
<button class='paperclip thumbnail' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button> <button class='paperclip thumbnail' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
<input type='file' class='file-input' multiple='multiple'> <input type='file' class='file-input' multiple='multiple'>
</div> </div>
<div class='capture-audio'> <div class='capture-audio' style='display:none' >
<button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button> <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
</div> </div>
<div class='send-message-container'> <div class='send-message-container'>

@ -725,16 +725,17 @@
}, },
async toggleMicrophone() { async toggleMicrophone() {
const allowMicrophone = await window.getMediaPermissions(); // FIXME audric hide microphone for now until refactor branch is merged
if ( // const allowMicrophone = await window.getMediaPermissions();
!allowMicrophone || // if (
this.$('.send-message').val().length > 0 || // !allowMicrophone ||
this.fileInput.hasFiles() // this.$('.send-message').val().length > 0 ||
) { // this.fileInput.hasFiles()
this.$('.capture-audio').hide(); // ) {
} else { this.$('.capture-audio').hide();
this.$('.capture-audio').show(); // } else {
} // this.$('.capture-audio').show();
// }
}, },
captureAudio(e) { captureAudio(e) {
e.preventDefault(); e.preventDefault();

Loading…
Cancel
Save