diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8cb07bb230..bba34f8254 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1644,6 +1644,7 @@ module ApplicationHelper # Returns the javascript tags that are included in the html layout head def javascript_heads tags = javascript_include_tag( + #'jquery-2.2.4-ui-1.11.0-ujs-5.2.3', 'jquery-3.5.1-ui-1.12.1-ujs-5.2.3', 'tribute-5.1.3.min', 'tablesort-5.2.1.min.js', diff --git a/public/javascripts/revision_graph.js b/public/javascripts/revision_graph.js index c2edf605bd..d3b0223e65 100644 --- a/public/javascripts/revision_graph.js +++ b/public/javascripts/revision_graph.js @@ -18,11 +18,12 @@ function drawRevisionGraph(holder, commits_hash, graph_space) { revisionGraph = Raphael(holder); var top = revisionGraph.set(); + var base_element = commit_table_rows.closest('.autoscroll'); // init dimensions var graph_x_offset = commit_table_rows.first().find('td').first().position().left - $(holder).position().left, - graph_y_offset = $(holder).position().top, + graph_y_offset = $(holder).offset().top - base_element.offset().top, graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP, - graph_bottom = commit_table_rows.last().position().top + commit_table_rows.last().height() - graph_y_offset; + graph_bottom = commit_table_rows.last().offset().top - base_element.offset().top + commit_table_rows.last().height() - graph_y_offset; var yForRow = function (index, commit) { @@ -30,9 +31,9 @@ function drawRevisionGraph(holder, commits_hash, graph_space) { switch (row.find("td:first").css("vertical-align")) { case "middle": - return row.position().top + (row.height() / 2) - graph_y_offset; + return row.offset().top - base_element.offset().top + (row.height() / 2) - graph_y_offset; default: - return row.position().top + - graph_y_offset + CIRCLE_INROW_OFFSET; + return row.offset().top - base_element.offset().top + - graph_y_offset + CIRCLE_INROW_OFFSET; } };