summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-06-17 10:17:15 +0200
committerAleksander Machniak <alec@alec.pl>2014-06-17 10:17:15 +0200
commitdb7dcf0936069b7d9ac5595c37f6c2aacc5c4ed7 (patch)
treef5f1185ef393714df30407b55f0b98a99120e31e
parentb8445cdcb9c15f1185db3538229ee23f85f8e084 (diff)
Close "no subject" prompt with Enter key (#1489580)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js26
2 files changed, 17 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d2fc4faaf..f92f8df5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Close "no subject" prompt with Enter key (#1489580)
- Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
- Password: Add option to force new users to change their password (#1486884)
- Improve support for screen readers and assistive technology using WCAG 2.0 and WAI ARIA standards
diff --git a/program/js/app.js b/program/js/app.js
index 82b69c4db..2b6adae28 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3553,26 +3553,32 @@ function rcube_webmail()
myprompt = $('<div class="prompt">').html('<div class="message">' + this.get_label('nosubjectwarning') + '</div>')
.appendTo(document.body),
prompt_value = $('<input>').attr({type: 'text', size: 30}).val(this.get_label('nosubject'))
- .appendTo(myprompt);
-
- buttons[this.get_label('cancel')] = function(){
- input_subject.focus();
- $(this).dialog('close');
+ .appendTo(myprompt),
+ save_func = function() {
+ input_subject.val(prompt_value.val());
+ myprompt.dialog('close');
+ ref.command(cmd, { nocheck:true }); // repeat command which triggered this
+ };
+
+ buttons[this.get_label('sendmessage')] = function() {
+ save_func($(this));
};
- buttons[this.get_label('sendmessage')] = function(){
- input_subject.val(prompt_value.val());
+ buttons[this.get_label('cancel')] = function() {
+ input_subject.focus();
$(this).dialog('close');
- ref.command(cmd, { nocheck:true }); // repeat command which triggered this
};
myprompt.dialog({
modal: true,
resizable: false,
buttons: buttons,
- close: function(event, ui) { $(this).remove() }
+ close: function(event, ui) { $(this).remove(); }
+ });
+
+ prompt_value.select().keydown(function(e) {
+ if (e.which == 13) save_func();
});
- prompt_value.select();
return false;
}