summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-11-05 18:47:25 +0100
committerJohan Sørensen <johan@johansorensen.com>2009-11-06 09:50:40 +0100
commit666cdb1c5d75fe893b4172caad8bad359a1aa94c (patch)
tree552ee913d63d750c062f615f434da2a0b7339563
parent3ccd5274935ab1e60192ebf82ece55d567823085 (diff)
downloadgitorious-mainline-outdated-666cdb1c5d75fe893b4172caad8bad359a1aa94c.zip
gitorious-mainline-outdated-666cdb1c5d75fe893b4172caad8bad359a1aa94c.tar.gz
gitorious-mainline-outdated-666cdb1c5d75fe893b4172caad8bad359a1aa94c.tar.bz2
When highlighting comment rows in the diff table, only inlude changed lines
-rw-r--r--lib/gitorious/diff/inline_table_callback.rb4
-rw-r--r--public/javascripts/diff_browser.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitorious/diff/inline_table_callback.rb b/lib/gitorious/diff/inline_table_callback.rb
index 86fa161..0ca5561 100644
--- a/lib/gitorious/diff/inline_table_callback.rb
+++ b/lib/gitorious/diff/inline_table_callback.rb
@@ -63,7 +63,7 @@ module Gitorious
end
def unmodline(line)
- %Q{<tr class="changes">} +
+ %Q{<tr class="changes unmod">} +
render_comment_count(line) +
%Q{<td class="line-numbers">#{line.old_number}</td>} +
%Q{<td class="line-numbers">#{line.new_number}</td>} +
@@ -71,7 +71,7 @@ module Gitorious
end
def sepline(line)
- %Q{<tr class="changes">} +
+ %Q{<tr class="changes hunk-sep">} +
render_comment_count(line) +
%Q{<td class="line-numbers line-num-cut">&hellip;</td>} +
%Q{<td class="line-numbers line-num-cut">&hellip;</td>} +
diff --git a/public/javascripts/diff_browser.js b/public/javascripts/diff_browser.js
index ed24bc5..4739309 100644
--- a/public/javascripts/diff_browser.js
+++ b/public/javascripts/diff_browser.js
@@ -182,7 +182,7 @@ Gitorious.DiffBrowser.CommentHighlighter = {
toggle: function(commentElement, cssClass, action) {
var lineData = commentElement.attr("gts:lines").split(/[^\d\-]/);
- var rows = commentElement.parents("table").find("tr.changes");
+ var rows = commentElement.parents("table").find("tr.changes:not(.hunk-sep,.unmod)");
var startRow = rows.filter("[data-line-num-tuple=" + lineData[0] + "]");
var sliceStart = rows.indexOf(startRow[0]);
var sliceEnd = sliceStart + parseInt(lineData[2]) + 1;
@@ -548,7 +548,7 @@ Gitorious.enableCommenting = function() {
start: function(e, ui) {
Gitorious.CommentForm.destroyAll();
},
- cancel: ".inline_comments, td.code",
+ cancel: ".inline_comments, td.code, td.line-num-cut",
stop: function(e, ui) {
var diffTable = e.target;
$(diffTable).find("td.ui-selected").each(function(el) {