You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2019/01/03 14:57:07 UTC
[02/11] allura git commit: [#5461] make post cancel button work
[#5461] make post cancel button work
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/dbd45bbb
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/dbd45bbb
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/dbd45bbb
Branch: refs/heads/master
Commit: dbd45bbbfb050a9db34eb3a26dfaf58724009d8b
Parents: a94c28b
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Dec 18 14:32:10 2018 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Dec 18 14:32:10 2018 -0500
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 10 ++++++----
Allura/allura/public/nf/js/allura-base.js | 4 ++++
ForgeTracker/forgetracker/templates/tracker/ticket.html | 2 --
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/dbd45bbb/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 1a38101..2829a49 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -181,9 +181,13 @@ class EditPost(ff.ForgeForm):
evt.preventDefault();
});
$("a.cancel_edit_post").click(function(evt){
- $("textarea", this.parentNode).val($("input.original_value", this.parentNode).val());
- $(".attachment_form_fields input", this.parentNode).val('');
evt.preventDefault();
+ var form = this.parentNode;
+ var orig_val = $("input.original_value", form).val();
+ $("textarea", form).val(orig_val);
+ get_cm(form).setValue(orig_val);
+ $("input.attachment_form_fields", form).val('');
+ $(this).closest('.reply_post_form').hide();
});
});''')
@@ -368,8 +372,6 @@ class Post(HierWidget):
}
}
- function get_cm($elem) { return $('.CodeMirror', $elem)[0].CodeMirror; }
-
if($('a.edit_post', post)){
$('a.edit_post', post).click(function (evt) {
evt.preventDefault();
http://git-wip-us.apache.org/repos/asf/allura/blob/dbd45bbb/Allura/allura/public/nf/js/allura-base.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/allura-base.js b/Allura/allura/public/nf/js/allura-base.js
index b59fbe2..ce813a9 100644
--- a/Allura/allura/public/nf/js/allura-base.js
+++ b/Allura/allura/public/nf/js/allura-base.js
@@ -162,6 +162,10 @@ function addCommas(num) {
return String(num).replace(new RegExp('(\\d)(?=(\\d\\d\\d)+(?!\\d))', 'g'), "$1,");
}
+function get_cm($elem) {
+ return $('.CodeMirror', $elem)[0].CodeMirror;
+}
+
$(function(){
$('html').removeClass('no-js').addClass('js');
http://git-wip-us.apache.org/repos/asf/allura/blob/dbd45bbb/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 666775f..ec13e24 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -193,8 +193,6 @@
var title_actions = title_holder.find('small');
var vote = $('#vote');
- function get_cm($elem) { return $('.CodeMirror', $elem)[0].CodeMirror; }
-
var discussion_comment_cm = get_cm($('#new_post_holder'));
$('a.edit_ticket').click(function () {