Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

disable send/reply buttons unless recipient and either subject or message body is filled #479

Merged
merged 1 commit into from Apr 15, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions js/mail.js
Expand Up @@ -444,6 +444,22 @@ var Mail = {
$('#mail-setup').removeClass('hidden');
// don't show New Message button on Add account screen
$('#mail_new_message').hide();
},

toggleSendButton:function () {
if(($('#to').val() !== '') && (($('#subject').val() !== '') || ($('#new-message-body').val() !== ''))) {
$('#new-message-send').removeAttr('disabled');
} else {
$('#new-message-send').attr('disabled', true);
}
},

toggleReplyButton:function () {
if(($('.reply-message-fields #to').val() !== '') && ($('.reply-message-body').val() !== '')) {
$('.reply-message-send').removeAttr('disabled');
} else {
$('.reply-message-send').attr('disabled', true);
}
}
}
};
Expand Down Expand Up @@ -602,6 +618,13 @@ $(document).ready(function () {
Mail.UI.setMessageActive(null);
});

// disable send/reply buttons unless recipient and either subject or message body is filled
$(document).on('change input paste keyup', '#to', Mail.UI.toggleSendButton);
$(document).on('change input paste keyup', '#subject', Mail.UI.toggleSendButton);
$(document).on('change input paste keyup', '#new-message-body', Mail.UI.toggleSendButton);
$(document).on('change input paste keyup', '.reply-message-fields #to', Mail.UI.toggleReplyButton);
$(document).on('change input paste keyup', '.reply-message-body', Mail.UI.toggleReplyButton);

$(document).on('click', '#mail-message .attachment-save-to-cloud', function(event) {
event.stopPropagation();
var messageId = $(this).parent().data('messageId');
Expand Down
4 changes: 2 additions & 2 deletions templates/index.php
Expand Up @@ -161,7 +161,7 @@ class="hidden"

<textarea name="body" class="reply-message-body"
placeholder="<?php p($l->t('Reply …')); ?>"></textarea>
<input class="reply-message-send primary" type="submit" value="<?php p($l->t('Reply')) ?>">
<input class="reply-message-send primary" type="submit" value="<?php p($l->t('Reply')) ?>" disabled>
<div><span id="reply-msg" class="msg"></div>
</div>
<div class="reply-message-more">
Expand Down Expand Up @@ -209,7 +209,7 @@ class="transparency"><?php p($l->t('+ cc/bcc')); ?></a>
placeholder="<?php p($l->t('Subject')); ?>" />
<textarea name="body" id="new-message-body"
placeholder="<?php p($l->t('Message …')); ?>"></textarea>
<input id="new-message-send" class="send primary" type="submit" value="<?php p($l->t('Send')) ?>">
<input id="new-message-send" class="send primary" type="submit" value="<?php p($l->t('Send')) ?>" disabled>
</div>
<div id="new-message-attachments">
</div>
Expand Down