summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
authorGislene Pereira <gislene01@gmail.com>2016-01-20 08:35:45 -0300
committerGislene Pereira <gislene01@gmail.com>2016-01-20 08:35:45 -0300
commit6ac9227214a9d84ef51be072ec888c0c92bf992a (patch)
tree78dd4bc5e73f23b178542c7b13832628143dba1a /web-ui
parent7bc660d72730ed02794aadb66f7a37aa7dada60b (diff)
Issue #572 - No whitespace between body input and Send when there's no attachment.
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/js/mail_view/ui/attachment_list.js1
-rw-r--r--web-ui/app/templates/compose/compose_box.hbs2
2 files changed, 2 insertions, 1 deletions
diff --git a/web-ui/app/js/mail_view/ui/attachment_list.js b/web-ui/app/js/mail_view/ui/attachment_list.js
index 786fcb1e..74a08d66 100644
--- a/web-ui/app/js/mail_view/ui/attachment_list.js
+++ b/web-ui/app/js/mail_view/ui/attachment_list.js
@@ -70,6 +70,7 @@ define(
}).bind('fileuploadstart', function (e) {
self.trigger(document, events.mail.uploadingAttachment);
}).bind('fileuploadadd', function (e) {
+ $('#attachment-list').show();
$('.attachmentsAreaWrap').show();
});
};
diff --git a/web-ui/app/templates/compose/compose_box.hbs b/web-ui/app/templates/compose/compose_box.hbs
index 06cc099a..fd8a034d 100644
--- a/web-ui/app/templates/compose/compose_box.hbs
+++ b/web-ui/app/templates/compose/compose_box.hbs
@@ -19,7 +19,7 @@
<textarea class="floatlabel" name="body" id="text-box" placeholder="{{t 'Body'}}" tabindex="5">{{body}}</textarea>
</div>
-<div id="attachment-list" class="buttons-group columns">
+<div id="attachment-list" class="buttons-group columns {{#unless attachments}}hide{{/unless}}">
<span class="btn btn-success fileinput-button">
<!-- The file input field used as target for the file upload widget -->
<input id="fileupload" type="file" name="attachment">