Merge pull request #952 from gitlabhq/remove_link_to_function
Get rid of deprecated link_to_function
This commit is contained in:
commit
bbb926f3c4
5 changed files with 18 additions and 2 deletions
|
@ -53,6 +53,14 @@ $(document).ready(function(){
|
|||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Commit show suppressed diff
|
||||
*
|
||||
*/
|
||||
$(".supp_diff_link").bind("click", function() {
|
||||
showDiff(this);
|
||||
});
|
||||
});
|
||||
|
||||
function focusSearch() {
|
||||
|
|
|
@ -34,6 +34,10 @@ var MergeRequest = {
|
|||
$(".merge-request-diffs").show();
|
||||
e.preventDefault();
|
||||
});
|
||||
|
||||
$(".mr_show_all_commits").bind("click", function() {
|
||||
MergeRequest.showAllCommits();
|
||||
})
|
||||
},
|
||||
|
||||
showState:
|
||||
|
|
|
@ -602,3 +602,7 @@ li.note {
|
|||
min-height:42px;
|
||||
}
|
||||
|
||||
.supp_diff_link,
|
||||
.mr_show_all_commits {
|
||||
cursor:pointer;
|
||||
}
|
||||
|
|
|
@ -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|
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
%li.bottom
|
||||
8 of #{@commits.count} commits displayed.
|
||||
%strong
|
||||
= link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
|
||||
%a.mr_show_all_commits Click here to show all
|
||||
%ul.all_mr_commits.hide.unstyled
|
||||
- @commits.each do |commit|
|
||||
= render "commits/commit", :commit => commit
|
||||
|
|
Loading…
Reference in a new issue