From 6d9f7e5de586a9e7a4a7c3ee7aea08e204b8d24e Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 17 Oct 2011 00:13:12 -0400 Subject: merged with bmo/4.0 --- extensions/Splinter/web/splinter.js | 5 +++++ template/en/default/bug/create/create.html.tmpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/Splinter/web/splinter.js b/extensions/Splinter/web/splinter.js index 842bebdb7..df3e74eac 100644 --- a/extensions/Splinter/web/splinter.js +++ b/extensions/Splinter/web/splinter.js @@ -1661,6 +1661,11 @@ Splinter.insertCommentEditor = function (commentArea, file, location, type) { Event.addListener('commentTextArea', 'keydown', function (e) { if (e.which == 13 && e.ctrlKey) { Splinter.saveComment(); + } else if (e.which == 27) { + var comment = Dom.get('commentTextArea').value; + if (previousText == comment || comment == '') { + Splinter.cancelComment(previousText); + } } else { Splinter.queueSaveDraft(); } diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 52f4c3cf4..d7e5602f8 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -356,7 +356,7 @@ TUI_hide_default('attachment_text_field'); %] - [% IF product.flag_types(isactive=>1).bug.size > 0 %] + [% IF product.flag_types(is_active=>1).bug.size > 0 %] [% display_flag_headers = 0 %] [% any_flags_requesteeble = 0 %] -- cgit v1.2.3-24-g4f1b