You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/07/27 15:12:00 UTC
[39/49] allura git commit: [#7897] ticket:814 Preserve ticket comment
on edit & focus description field to show content
[#7897] ticket:814 Preserve ticket comment on edit & focus description field to show content
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a51c6496
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a51c6496
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a51c6496
Branch: refs/heads/ib/7897
Commit: a51c649694cf133d02183545ae629f3009e1cf95
Parents: ef6eaef
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jul 7 17:50:30 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Jul 27 14:23:55 2015 +0300
----------------------------------------------------------------------
.../forgetracker/templates/tracker/new_ticket.html | 4 ----
.../forgetracker/templates/tracker/ticket.html | 15 +++++++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a51c6496/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
index dd9f5e9..24141a4 100644
--- a/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/new_ticket.html
@@ -33,10 +33,6 @@
{% block extra_css %}
<style type="text/css">
- .markdown_edit textarea {
- height: 100px;
- }
-
.new-ticket-title {
top: 7px;
position: absolute;
http://git-wip-us.apache.org/repos/asf/allura/blob/a51c6496/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 5f9f534..a68e723 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -192,10 +192,13 @@
var original_title = title_holder.text();
var title_actions = title_holder.find('small');
var vote = $('#vote');
- var discussion_comment_textarea = $('#new_post_holder').find('form').find('textarea');
+
+ function get_cm($elem) { return $('.CodeMirror', $elem)[0].CodeMirror; }
+
+ var discussion_comment_cm = get_cm($('#new_post_holder'));
$('a.edit_ticket').click(function () {
- var not_posted_comment = discussion_comment_textarea.val();
+ var not_posted_comment = discussion_comment_cm.getValue();
form_holder.show();
view_holder.hide();
discussion_holder.hide();
@@ -206,8 +209,12 @@
vote.hide();
$('div.new-ticket-title label').hide();
$('a.edit_ticket').addClass('btn_activate');
- $('textarea[name="ticket_form.description"]').trigger('editticket.forgetracker').focus();
- $('textarea[name="ticket_form.comment"]').val(not_posted_comment);
+ var cm = get_cm(form_holder);
+ cm.refresh();
+ cm.focus();
+ var comment_cm = get_cm($('textarea[name="ticket_form.comment"]').parent());
+ comment_cm.setValue(not_posted_comment);
+ $('textarea[name="ticket_form.description"]').trigger('editticket.forgetracker');
$(this).trigger('editTicket');
return false;
});