From c586449eb33d35507d6417e970a222903a2b927a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 19 Nov 2016 11:17:42 +0000 Subject: [PATCH] Don't replace the already entered comment when quoting a previous comment. git-svn-id: http://svn.redmine.org/redmine/trunk@15990 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/journals/new.js.erb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb index cd6ab0d35..0f832f37f 100644 --- a/app/views/journals/new.js.erb +++ b/app/views/journals/new.js.erb @@ -1,4 +1,9 @@ -$('#issue_notes').val("<%= raw escape_javascript(@content) %>"); +showAndScrollTo("update"); + +var notes = $('#issue_notes').val(); +if (notes > "") { notes = notes + "\n\n"} + +$('#issue_notes').blur().focus().val(notes + "<%= raw escape_javascript(@content) %>"); <% # when quoting a private journal, check the private checkbox if @journal && @journal.private_notes? @@ -6,5 +11,3 @@ $('#issue_notes').val("<%= raw escape_javascript(@content) %>"); $('#issue_private_notes').prop('checked', true); <% end %> -showAndScrollTo("update", "notes"); -$('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight; -- 2.39.5