Merge pull request #951 from robbkidd/remove_link_to_function

Replace calls to deprecated link_to_function with doc-ready functions.
This commit is contained in:
Valeriy Sizov 2012-06-20 10:43:32 -07:00
commit 65c35394eb
5 changed files with 17 additions and 14 deletions

View file

@ -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({

View file

@ -57,3 +57,10 @@ var CommitsList = {
});
}
}
$(function () {
$('a.supp_diff_link').live('click', function() {
$(link).next('table').show();
$(link).remove();
});
});

View file

@ -58,15 +58,16 @@ var MergeRequest = {
dataType: "script"});
},
showAllCommits:
function() {
$(".first_mr_commits").remove();
$(".all_mr_commits").removeClass("hide");
},
already_cannot_be_merged:
function(){
$(".automerge_widget").hide();
$(".automerge_widget.already_cannot_be_merged").show();
}
}
$(function () {
$('.first_mr_commits a.show_all').live('click', function() {
$(".first_mr_commits").remove();
$(".all_mr_commits").removeClass("hide");
});
});

View file

@ -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|

View file

@ -1,4 +1,4 @@
- unless @commits.empty?
- if @commits.present?
.ui-box
%h5 Commits (#{@commits.count})
.merge-request-commits
@ -9,7 +9,7 @@
%li.bottom
8 of #{@commits.count} commits displayed.
%strong
= link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
%a.show_all Click here to show all
%ul.all_mr_commits.hide.unstyled
- @commits.each do |commit|
= render "commits/commit", :commit => commit