Download as
Browse Code »

Commit bbb926f3c49ea32320ec2e000e03a9d45b94197b

Authored by Dmitriy Zaporozhets
2 parents 6507c108 d5b41831
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #952 from gitlabhq/remove_link_to_function 

Get rid of deprecated link_to_function
Showing 5 changed files with 18 additions and 2 deletions   Show diff stats
app/assets/javascripts/application.js
  Diff comments   View file @bbb926f
@@ -53,6 +53,14 @@ $(document).ready(function(){ @@ -53,6 +53,14 @@ $(document).ready(function(){
53 e.preventDefault(); 53 e.preventDefault();
54 } 54 }
55 }); 55 });
  56 +
  57 + /**
  58 + * Commit show suppressed diff
  59 + *
  60 + */
  61 + $(".supp_diff_link").bind("click", function() {
  62 + showDiff(this);
  63 + });
56 }); 64 });
57 65
58 function focusSearch() { 66 function focusSearch() {
app/assets/javascripts/merge_requests.js
  Diff comments   View file @bbb926f
@@ -34,6 +34,10 @@ var MergeRequest = { @@ -34,6 +34,10 @@ var MergeRequest = {
34 $(".merge-request-diffs").show(); 34 $(".merge-request-diffs").show();
35 e.preventDefault(); 35 e.preventDefault();
36 }); 36 });
  37 +
  38 + $(".mr_show_all_commits").bind("click", function() {
  39 + MergeRequest.showAllCommits();
  40 + })
37 }, 41 },
38 42
39 showState: 43 showState:
app/assets/stylesheets/common.scss
  Diff comments   View file @bbb926f
@@ -602,3 +602,7 @@ li.note { @@ -602,3 +602,7 @@ li.note {
602 min-height:42px; 602 min-height:42px;
603 } 603 }
604 604
  605 +.supp_diff_link,
  606 +.mr_show_all_commits {
  607 + cursor:pointer;
  608 +}
app/views/commits/_text_file.html.haml
  Diff comments   View file @bbb926f
1 - too_big = max_lines = diff.diff.lines.count > 1000 1 - too_big = max_lines = diff.diff.lines.count > 1000
2 - if too_big 2 - if too_big
3 - = link_to_function "Diff suppressed. Click to show", "showDiff(this)", :class => "supp_diff_link" 3 + %a.supp_diff_link Diff suppressed. Click to show
4 4
5 %table{:class => "#{'hide' if too_big}"} 5 %table{:class => "#{'hide' if too_big}"}
6 - each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old| 6 - each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old|
app/views/merge_requests/_commits.html.haml
  Diff comments   View file @bbb926f
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 %li.bottom 9 %li.bottom
10 8 of #{@commits.count} commits displayed. 10 8 of #{@commits.count} commits displayed.
11 %strong 11 %strong
12 - = link_to_function "Click here to show all", "MergeRequest.showAllCommits()" 12 + %a.mr_show_all_commits Click here to show all
13 %ul.all_mr_commits.hide.unstyled 13 %ul.all_mr_commits.hide.unstyled
14 - @commits.each do |commit| 14 - @commits.each do |commit|
15 = render "commits/commit", :commit => commit 15 = render "commits/commit", :commit => commit