From: Valeriy Sizov <vsv2711@gmail.com>
Date: Sat, 23 Jun 2012 22:14:45 +0000 (+0300)
Subject: Diff refactoring
X-Git-Tag: v2.6.3~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e1c5b7afe42d6d88997aaa4f4877c37965866a5;p=wvm%2Fgitlab.git

Diff refactoring
---

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index a314f3876..7ee85a5b4 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -17,7 +17,7 @@ module CommitsHelper
     preserve out
   end
 
-  def diff_line_class(line)
+  def identification_type(line)
     if line[0] == "+"
       "new"
     elsif line[0] == "-"
@@ -27,7 +27,7 @@ module CommitsHelper
     end
   end
 
-  def build_line_code(line, index, line_new, line_old)
+  def build_line_anchor(index, line_new, line_old)
     "#{index}_#{line_old}_#{line_new}"
   end
 
@@ -51,12 +51,12 @@ module CommitsHelper
         line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
         line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
 
-        next if line_old == 1 && line_new == 1
+        next if line_old == 1 && line_new == 1 #top of file
         yield(full_line, type, nil, nil, nil)
         next
       else
-        type = diff_line_class(line)
-        line_code = build_line_code(line, index, line_new, line_old)
+        type = identification_type(line)
+        line_code = build_line_anchor(index, line_new, line_old)
         yield(full_line, type, line_code, line_new, line_old)
       end
 
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index fa3d83ca8..cab066410 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -1,4 +1,4 @@
-- too_big = max_lines = diff.diff.lines.count > 1000
+- too_big = diff.diff.lines.count > 1000
 - if too_big
   %a.supp_diff_link Diff suppressed. Click to show