Skip to content

Allow th tags in tbody #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow th tags in tbody #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stupidtable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
index: index
};

$(tr).children('td').each(function(idx, td){
$(tr).children('td, th').each(function(idx, td){
var sort_val = $(td).data("sort-value");

// Store and read from the .data cache for display text only sorts
Expand Down
13 changes: 7 additions & 6 deletions tests/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

<!--
WOW, Javascript dependencies galore. And people do this normally!
--!>
-->

<script src="jquery.js"></script>
<script src="underscore.js"></script>
<script src="../stupidtable.js"></script>
Expand All @@ -33,27 +34,27 @@ <h2>Basic Table</h2>
</thead>
<tbody>
<tr>
<td>15</td>
<th scope="row">15</th>
<td>-.18</td>
<td>banana</td>
</tr>
<tr class="awesome">
<td>95</td>
<th scope="row">95</th>
<td>36</td>
<td>coke</td>
</tr>
<tr>
<td data-sort-value=2>2</td>
<th scope="row" data-sort-value=2>2</th>
<td>-152.5</td>
<td>apple</td>
</tr>
<tr>
<td>-53</td>
<th scope="row">-53</th>
<td>88.5</td>
<td>zebra</td>
</tr>
<tr>
<td>195</td>
<th scope="row">195</th>
<td>-858</td>
<td>orange</td>
</tr>
Expand Down
18 changes: 9 additions & 9 deletions tests/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ window.WAIT_TIME_MS = 200;
var get_column_elements = function($table, col_index){
var vals = [];
$table.find("tbody tr").each(function(){
var val = $(this).children("td").eq(col_index).html();
var val = $(this).children("td, th").eq(col_index).html();
vals.push(val);
});
return vals;
Expand Down Expand Up @@ -427,7 +427,7 @@ asyncTest("Update sort value - same display and sort values - single click", fun
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable();
ok(_.isEqual($first_int_td.text(), "15"));
Expand All @@ -448,7 +448,7 @@ asyncTest("Update sort value - same display and sort values - double click", fun
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable();
ok(_.isEqual($first_int_td.text(), "15"));
Expand Down Expand Up @@ -542,7 +542,7 @@ asyncTest("Update sort value - display value only doesn't add data-sort-value at
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable();
ok(_.isEqual($first_int_td.text(), "15"));
Expand All @@ -552,7 +552,7 @@ asyncTest("Update sort value - display value only doesn't add data-sort-value at
$int_column.click();

test_table_state(function(){
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();
var expected = ["-53", "2", "95", "195", "200"];
var vals = get_column_elements($table, INT_COLUMN);

Expand Down Expand Up @@ -741,7 +741,7 @@ asyncTest("test will_manually_build_table setting - 1", function(){
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable_settings({
will_manually_build_table: true
Expand All @@ -768,7 +768,7 @@ asyncTest("test will_manually_build_table setting - 2", function(){
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable_settings({
will_manually_build_table: true
Expand Down Expand Up @@ -798,7 +798,7 @@ asyncTest("test will_manually_build_table setting - 3", function(){
var $table = $("#basic");
var $table_cols = $table.find("th");
var $int_column = $table_cols.eq(INT_COLUMN);
var $first_int_td = $table.find("tbody tr td").first();
var $first_int_td = $table.find("tbody tr > *").first();

$table.stupidtable_settings({
will_manually_build_table: false
Expand Down Expand Up @@ -848,7 +848,7 @@ asyncTest("Basic multicolumn sort", function(){
var FLOAT_COLUMN = 1;
var STRING_COLUMN = 2;
var $table = $("#multicolumn-sort-test");
var $table_cols = $table.find("th");
var $table_cols = $table.find("thead th");

$table.stupidtable();
$table_cols.eq(INT_COLUMN).click();
Expand Down