summaryrefslogtreecommitdiffstats
path: root/template/en/default/bug
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-10-27 00:48:33 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-10-27 00:48:33 +0200
commit9e8067ca4bb9e0d21a397f681fce376e9b28ef92 (patch)
tree1fa4f58ac0a732fa46d4991644b9ed8d66349ef2 /template/en/default/bug
parentf2a3931c5f955bc2b26d3a6ee6e3fb55f6a27ee4 (diff)
downloadbugzilla-9e8067ca4bb9e0d21a397f681fce376e9b28ef92.tar.gz
bugzilla-9e8067ca4bb9e0d21a397f681fce376e9b28ef92.tar.xz
Bug 551468: Stop word-wrapping comments on the server
r=glob, a=mkanat
Diffstat (limited to 'template/en/default/bug')
-rw-r--r--template/en/default/bug/comments.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl12
-rw-r--r--template/en/default/bug/field.html.tmpl3
-rw-r--r--template/en/default/bug/process/midair.html.tmpl2
4 files changed, 4 insertions, 15 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 580ba6b5e..208ea092a 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -102,7 +102,7 @@
[% BLOCK a_comment %]
[% RETURN IF comment.is_private AND ! user.is_insider %]
- [% comment_text = comment.body_full({ wrap => 1 }) %]
+ [% comment_text = comment.body_full %]
[% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
<div id="c[% count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9c951fb2e..2a9a0776e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -52,17 +52,7 @@
/* pre id="comment_name_N" */
var text_elem = document.getElementById('comment_text_'+id);
var text = getText(text_elem);
-
- /* make sure we split on all newlines -- IE or Moz use \r and \n
- * respectively.
- */
- text = text.split(/\r|\n/);
-
- for (var i=0; i < text.length; i++) {
- replytext += "> " + text[i] + "\n";
- }
-
- replytext = prefix + replytext + "\n";
+ replytext = prefix + wrapReplyText(text);
[% ELSIF user.settings.quote_replies.value == 'simple_reply' %]
replytext = prefix;
[% END %]
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 4065b3af0..1eb4574bf 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -206,8 +206,7 @@
</script>
[% END %]
[% ELSIF field.type == constants.FIELD_TYPE_TEXTAREA %]
- <div class="uneditable_textarea">[% value FILTER wrap_comment(60)
- FILTER html %]</div>
+ <div class="uneditable_textarea">[% value FILTER html %]</div>
[% ELSIF field.type == constants.FIELD_TYPE_BUG_ID %]
[% IF value %]
[% value FILTER bug_link(value, use_alias => 1) FILTER none %]
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 8a49f7cdc..157cb44b4 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -67,7 +67,7 @@
<p>
Your comment was:<br>
<blockquote><pre class="bz_comment_text">
- [% cgi.param("comment") FILTER wrap_comment FILTER html %]
+ [% cgi.param("comment") FILTER html %]
</pre></blockquote>
</p>
[% END %]