From db7dcf0936069b7d9ac5595c37f6c2aacc5c4ed7 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 17 Jun 2014 04:17:15 -0400 Subject: [PATCH] Close "no subject" prompt with Enter key (#1489580) --- CHANGELOG | 1 + program/js/app.js | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d2fc4fa..f92f8df 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 82b69c4..2b6adae 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -3553,26 +3553,32 @@ 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); + .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('cancel')] = function(){ + buttons[this.get_label('sendmessage')] = function() { + save_func($(this)); + }; + buttons[this.get_label('cancel')] = function() { input_subject.focus(); $(this).dialog('close'); - }; - buttons[this.get_label('sendmessage')] = function(){ - input_subject.val(prompt_value.val()); - $(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(); + prompt_value.select().keydown(function(e) { + if (e.which == 13) save_func(); + }); + return false; } -- Gitblit v1.9.1