Skip to content

Commit 1f4015c

Browse files
committed
DataTables seems to have auto recognition now
https://datatables.net/forums/discussion/56451/sorting-on-percentage I'm still half-way sure I saw errors before but maybe not.
1 parent 78fae0a commit 1f4015c

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

assets/javascripts/application.js

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,8 @@
55
$(document).ready(function () {
66
branchCoverageActivated = $("body").data("branch-coverage") == true;
77

8-
// Configuration for fancy sortable tables for source file groups
9-
// For what these columns are, cecl out file_list.erb - null basically
10-
// does normal/number style sorting which fine for hit/missed lines only
11-
// percentages like "covered percent" need special sorting arguments.
12-
lineColumns = [null, { "sType": "percent" }, null, null, null, null, null];
13-
branchColumns = [{ "sType": "percent" }, null, null, null];
14-
15-
dataColumns = branchCoverageActivated ? lineColumns.concat(branchColumns) : lineColumns;
16-
178
$('.file_list').dataTable({
18-
"aaSorting": [[1, "asc"]],
19-
"bPaginate": false,
20-
"bJQueryUI": true,
21-
"aoColumns": dataColumns
9+
"aaSorting": [[1, "asc"]]
2210
});
2311

2412
// Syntax highlight all files up front - deactivated
@@ -69,13 +57,13 @@ $(document).ready(function () {
6957
}
7058
});
7159

72-
window.onpopstate = function(event){
73-
if (window.location.hash.substring(0,2) == "#_") {
60+
window.onpopstate = function (event) {
61+
if (window.location.hash.substring(0, 2) == "#_") {
7462
$.colorbox.close();
7563
curr_anchor = window.location.hash.substring(1);
7664
} else {
7765
if ($('#colorbox').is(':hidden')) {
78-
$('a.src_link[href="'+window.location.hash+'"]').colorbox({ open: true });
66+
$('a.src_link[href="' + window.location.hash + '"]').colorbox({ open: true });
7967
}
8068
}
8169
};
@@ -98,10 +86,10 @@ $(document).ready(function () {
9886
});
9987

10088
// Make sure tabs don't get ugly focus borders when active
101-
$('.group_tabs').on('focus', 'a', function() { $(this).blur(); });
89+
$('.group_tabs').on('focus', 'a', function () { $(this).blur(); });
10290

10391
var favicon_path = $('link[rel="shortcut icon"]').attr('href');
104-
$('.group_tabs').on('click', 'a', function(){
92+
$('.group_tabs').on('click', 'a', function () {
10593
if (!$(this).parent().hasClass('active')) {
10694
$('.group_tabs a').parent().removeClass('active');
10795
$(this).parent().addClass('active');

0 commit comments

Comments
 (0)