Enable sending audio recordings

pull/574/head
Beaudan Brown 6 years ago
parent 49fcb50d48
commit a3635216db

@ -1228,8 +1228,7 @@
"Option to control creation and send of link previews in setting screen" "Option to control creation and send of link previews in setting screen"
}, },
"linkPreviewsSettingDescription": { "linkPreviewsSettingDescription": {
"message": "message": "Enable link previews",
"Enable link previews",
"description": "Description shown for the Link Preview option " "description": "Description shown for the Link Preview option "
}, },
"spellCheckDescription": { "spellCheckDescription": {

@ -133,12 +133,12 @@
<div class='flex'> <div class='flex'>
<button class='emoji' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button> <button class='emoji' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
<textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea> <textarea maxlength='2000' class='send-message' placeholder='{{ send-message }}' rows='1' dir='auto' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></textarea>
<div class='capture-audio hide'> <div class='capture-audio'>
<button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button> <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
</div> </div>
<div id='choose-file' class='choose-file'> <div id='choose-file' class='choose-file'>
<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' accept='video/* image/*'> <input type='file' class='file-input' multiple='multiple'>
</div> </div>
</div> </div>
</form> </form>
@ -654,8 +654,6 @@
<div class='error'></div> <div class='error'></div>
</div> </div>
<div class='buttons'> <div class='buttons'>
<!-- <a class='button grey' id='back-button'>Back</a> -->
<!-- <a class='button' id='save-button' data-loading-text='Please wait...'>Save</a> -->
<button class='button grey' id='back-button' tabindex='2'>Back</button> <button class='button grey' id='back-button' tabindex='2'>Back</button>
<button class='button' id='save-button' tabindex='1'>Save</button> <button class='button' id='save-button' tabindex='1'>Save</button>
</div> </div>

@ -2015,7 +2015,9 @@
); );
const ourNumber = textsecure.storage.user.getNumber(); const ourNumber = textsecure.storage.user.getNumber();
return !stillUnread.some( return !stillUnread.some(
m => m.propsForMessage.text && m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1 m =>
m.propsForMessage.text &&
m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1
); );
})(); })();

@ -942,7 +942,16 @@ class LokiPublicChannelAPI {
} }
static getAnnotationFromAttachment(attachment) { static getAnnotationFromAttachment(attachment) {
const type = attachment.contentType.match(/^image/) ? 'photo' : 'video'; let type;
if (attachment.contentType.match(/^image/)) {
type = 'photo';
} else if (attachment.contentType.match(/^video/)) {
type = 'video';
} else if (attachment.contentType.match(/^audio/)) {
type = 'audio';
} else {
type = 'other';
}
const annotation = { const annotation = {
type: ATTACHMENT_TYPE, type: ATTACHMENT_TYPE,
value: { value: {

@ -636,10 +636,6 @@
}, },
toggleMicrophone() { toggleMicrophone() {
// ALWAYS HIDE until we support audio
this.$('.capture-audio').hide();
/*
if ( if (
this.$('.send-message').val().length > 0 || this.$('.send-message').val().length > 0 ||
this.fileInput.hasFiles() this.fileInput.hasFiles()
@ -648,7 +644,6 @@
} else { } else {
this.$('.capture-audio').show(); this.$('.capture-audio').show();
} }
*/
}, },
captureAudio(e) { captureAudio(e) {
e.preventDefault(); e.preventDefault();

@ -57,10 +57,9 @@
if (_.isEmpty(nickname)) { if (_.isEmpty(nickname)) {
this.$('.ok').attr('disabled', 'disabled'); this.$('.ok').attr('disabled', 'disabled');
return false; return false;
} else { }
this.$('.ok').removeAttr('disabled'); this.$('.ok').removeAttr('disabled');
return true; return true;
}
}, },
render_attributes() { render_attributes() {
return { return {

@ -90,10 +90,9 @@
if (_.isEmpty(newVal)) { if (_.isEmpty(newVal)) {
this.$('#save-button').attr('disabled', 'disabled'); this.$('#save-button').attr('disabled', 'disabled');
return false; return false;
} else { }
this.$('#save-button').removeAttr('disabled'); this.$('#save-button').removeAttr('disabled');
return true; return true;
}
}, },
async showPage(pageIndex) { async showPage(pageIndex) {
// eslint-disable-next-line func-names // eslint-disable-next-line func-names

Loading…
Cancel
Save