diff options
author | Robb Kidd <robb@thekidds.org> | 2012-06-20 11:11:17 -0400 |
---|---|---|
committer | Robb Kidd <robb@thekidds.org> | 2012-06-20 11:11:17 -0400 |
commit | ef1598b4afa94b21db7f38755182a701d03ae44a (patch) | |
tree | bcc9d91c483584d91a582f426e16d1203225fc21 | |
parent | 5b1ede628065ecfdf95552322328b5bb7613753a (diff) | |
download | gitlab-ce-ef1598b4afa94b21db7f38755182a701d03ae44a.tar.gz |
Handle Commit "show suppressed diff" link with a doc-ready event handler.
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c
Still absent is a graceful degrade for no-JS.
-rw-r--r-- | app/assets/javascripts/application.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/commits.js | 7 | ||||
-rw-r--r-- | app/views/commits/_text_file.html.haml | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0af0b11a931..bc91c9730ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -75,11 +75,6 @@ function slugify(text) { return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase(); } -function showDiff(link) { - $(link).next('table').show(); - $(link).remove(); -} - (function($){ var _chosen = $.fn.chosen; $.fn.extend({ diff --git a/app/assets/javascripts/commits.js b/app/assets/javascripts/commits.js index b31fe485896..5afac8c32c3 100644 --- a/app/assets/javascripts/commits.js +++ b/app/assets/javascripts/commits.js @@ -57,3 +57,10 @@ var CommitsList = { }); } } + +$(function () { + $('a.supp_diff_link').live('click', function() { + $(link).next('table').show(); + $(link).remove(); + }); +}); diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index e5173b00ed7..fa3d83ca85d 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -1,6 +1,6 @@ - too_big = max_lines = diff.diff.lines.count > 1000 - if too_big - = link_to_function "Diff suppressed. Click to show", "showDiff(this)", :class => "supp_diff_link" + %a.supp_diff_link Diff suppressed. Click to show %table{:class => "#{'hide' if too_big}"} - each_diff_line(diff.diff.lines.to_a, index) do |line, type, line_code, line_new, line_old| |