mirror of
https://github.com/Mottie/tablesorter.git
synced 2024-10-08 13:44:18 +00:00
Pager: fixedHeight is working properly. Fixes #742 & 729
This commit is contained in:
parent
ae65dc5477
commit
3c0380cad4
@ -206,6 +206,7 @@
|
||||
}
|
||||
}
|
||||
pagerArrows(p);
|
||||
fixHeight(table, p);
|
||||
if (p.initialized && completed !== false) {
|
||||
c.$table.trigger('pagerComplete', p);
|
||||
// save pager info to storage
|
||||
@ -282,22 +283,28 @@
|
||||
var d, h,
|
||||
c = table.config,
|
||||
$b = c.$tbodies.eq(0);
|
||||
if (p.fixedHeight) {
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
if (p.fixedHeight && !p.isDisabled) {
|
||||
h = $.data(table, 'pagerSavedHeight');
|
||||
if (h) {
|
||||
d = h - $b.height();
|
||||
if ( d > 5 && $.data(table, 'pagerLastSize') === p.size && $b.children('tr:visible').length < p.size ) {
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.replace(/^(\w+\.)/g,'') + '" style="height:' + d + 'px;"></tr>');
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '" style="height:' + d + 'px;"></tr>');
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
changeHeight = function(table, p) {
|
||||
var $b = table.config.$tbodies.eq(0);
|
||||
var h,
|
||||
c = table.config,
|
||||
$b = c.$tbodies.eq(0);
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
$.data(table, 'pagerSavedHeight', $b.height());
|
||||
if (!$b.children('tr:visible').length) {
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '"><td> </td></tr>');
|
||||
}
|
||||
h = $b.children('tr').eq(0).height() * p.size;
|
||||
$.data(table, 'pagerSavedHeight', h);
|
||||
fixHeight(table, p);
|
||||
$.data(table, 'pagerLastSize', p.size);
|
||||
},
|
||||
@ -455,7 +462,6 @@
|
||||
p.last.currentFilters = p.currentFilters;
|
||||
p.last.sortList = (c.sortList || []).join(',');
|
||||
updatePageDisplay(table, p, true);
|
||||
fixHeight(table, p);
|
||||
$t.trigger('updateCache', [function(){
|
||||
if (p.initialized) {
|
||||
// apply widgets after table has rendered & after a delay to prevent
|
||||
@ -597,7 +603,6 @@
|
||||
ts.processTbody(table, $tb, false);
|
||||
}
|
||||
updatePageDisplay(table, p, true);
|
||||
if ( !p.isDisabled ) { fixHeight(table, p); }
|
||||
if (table.isUpdating) {
|
||||
$t.trigger('updateComplete', [ table, true ]);
|
||||
}
|
||||
@ -765,11 +770,11 @@
|
||||
p.$container.find(p.cssPageDisplay).attr('id', info);
|
||||
c.$table.attr('aria-describedby', info);
|
||||
}
|
||||
changeHeight(table, p);
|
||||
if ( triggered ) {
|
||||
c.$table.trigger('updateRows');
|
||||
setPageSize(table, p.size, p);
|
||||
hideRowsSetup(table, p);
|
||||
fixHeight(table, p);
|
||||
if (c.debug) {
|
||||
ts.log('pager enabled');
|
||||
}
|
||||
@ -839,11 +844,9 @@
|
||||
// make sure we have a copy of all table rows once the cache has been built
|
||||
updateCache(table);
|
||||
}
|
||||
// update page display first, so we update p.filteredPages
|
||||
updatePageDisplay(table, p, false);
|
||||
moveToPage(table, p, false);
|
||||
c.$table.trigger('applyWidgets');
|
||||
fixHeight(table, p);
|
||||
updatePageDisplay(table, p, false);
|
||||
}
|
||||
})
|
||||
.bind('disable.pager', function(e){
|
||||
@ -862,7 +865,6 @@
|
||||
e.stopPropagation();
|
||||
// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
|
||||
if ( !table || triggered ) { return; }
|
||||
fixHeight(table, p);
|
||||
var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
|
||||
p.totalRows = $rows.length - ( p.countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
|
||||
p.totalPages = Math.ceil( p.totalRows / p.size );
|
||||
@ -870,8 +872,12 @@
|
||||
// make a copy of all table rows once the cache has been built
|
||||
updateCache(table);
|
||||
}
|
||||
updatePageDisplay(table, p, true);
|
||||
if ( p.page >= p.totalPages ) {
|
||||
moveToLastPage(table, p);
|
||||
}
|
||||
hideRows(table, p);
|
||||
changeHeight(table, p);
|
||||
updatePageDisplay(table, p, true);
|
||||
})
|
||||
.bind('pageSize.pager', function(e,v){
|
||||
e.stopPropagation();
|
||||
@ -955,8 +961,6 @@
|
||||
hideRowsSetup(table, p);
|
||||
}
|
||||
|
||||
changeHeight(table, p);
|
||||
|
||||
// pager initialized
|
||||
if (!p.ajax) {
|
||||
p.initialized = true;
|
||||
|
@ -266,226 +266,28 @@
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Student01</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>80</td>
|
||||
<td>70</td>
|
||||
<td>75</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student02</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>90</td>
|
||||
<td>88</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student03</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>85</td>
|
||||
<td>95</td>
|
||||
<td>80</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student04</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>60</td>
|
||||
<td>55</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student05</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>68</td>
|
||||
<td>80</td>
|
||||
<td>95</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student06</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>99</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student07</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>85</td>
|
||||
<td>68</td>
|
||||
<td>90</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student08</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td>90</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student09</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>80</td>
|
||||
<td>50</td>
|
||||
<td>65</td>
|
||||
<td>75</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student10</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>85</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student11</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>86</td>
|
||||
<td>85</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student12</td>
|
||||
<td>Mathematics</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>75</td>
|
||||
<td>70</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student13</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>80</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student14</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>50</td>
|
||||
<td>45</td>
|
||||
<td>55</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student15</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>95</td>
|
||||
<td>35</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student16</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>50</td>
|
||||
<td>30</td>
|
||||
<td>70</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student17</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>80</td>
|
||||
<td>100</td>
|
||||
<td>55</td>
|
||||
<td>65</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student18</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>30</td>
|
||||
<td>49</td>
|
||||
<td>55</td>
|
||||
<td>75</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student19</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>68</td>
|
||||
<td>90</td>
|
||||
<td>88</td>
|
||||
<td>70</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student20</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>40</td>
|
||||
<td>45</td>
|
||||
<td>40</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student21</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>50</td>
|
||||
<td>45</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student22</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>99</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr><td>Student01</td><td>Languages</td><td>male</td><td>80</td><td>70</td><td>75</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student02</td><td>Mathematics</td><td>male</td><td>90</td><td>88</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student03</td><td>Languages</td><td>female</td><td>85</td><td>95</td><td>80</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student04</td><td>Languages</td><td>male</td><td>60</td><td>55</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student05</td><td>Languages</td><td>female</td><td>68</td><td>80</td><td>95</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student06</td><td>Mathematics</td><td>male</td><td>100</td><td>99</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student07</td><td>Mathematics</td><td>male</td><td>85</td><td>68</td><td>90</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student08</td><td>Languages</td><td>male</td><td>100</td><td>90</td><td>90</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student09</td><td>Mathematics</td><td>male</td><td>80</td><td>50</td><td>65</td><td>75</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student10</td><td>Languages</td><td>male</td><td>85</td><td>100</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student11</td><td>Languages</td><td>male</td><td>86</td><td>85</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student12</td><td>Mathematics</td><td>female</td><td>100</td><td>75</td><td>70</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student13</td><td>Languages</td><td>female</td><td>100</td><td>80</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student14</td><td>Languages</td><td>female</td><td>50</td><td>45</td><td>55</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student15</td><td>Languages</td><td>male</td><td>95</td><td>35</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student16</td><td>Languages</td><td>female</td><td>100</td><td>50</td><td>30</td><td>70</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student17</td><td>Languages</td><td>female</td><td>80</td><td>100</td><td>55</td><td>65</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student18</td><td>Mathematics</td><td>male</td><td>30</td><td>49</td><td>55</td><td>75</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student19</td><td>Languages</td><td>male</td><td>68</td><td>90</td><td>88</td><td>70</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student20</td><td>Mathematics</td><td>male</td><td>40</td><td>45</td><td>40</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student21</td><td>Languages</td><td>male</td><td>50</td><td>45</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student22</td><td>Mathematics</td><td>male</td><td>100</td><td>99</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student23</td><td>Mathematics</td><td>male</td><td>82</td><td>77</td><td>0</td><td>79</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student24</td><td>Languages</td><td>female</td><td>100</td><td>91</td><td>13</td><td>82</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student25</td><td>Mathematics</td><td>male</td><td>22</td><td>96</td><td>82</td><td>53</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
|
@ -54,7 +54,7 @@
|
||||
|
||||
// if true, the table will remain the same height no matter how many records are displayed. The space is made up by an empty
|
||||
// table row set to a height to compensate; default is false
|
||||
pager_fixedHeight: false,
|
||||
pager_fixedHeight: true,
|
||||
|
||||
// remove rows from the table to speed up the sort of large tables.
|
||||
// setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
|
||||
@ -282,226 +282,28 @@
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Student01</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>80</td>
|
||||
<td>70</td>
|
||||
<td>75</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student02</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>90</td>
|
||||
<td>88</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student03</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>85</td>
|
||||
<td>95</td>
|
||||
<td>80</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student04</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>60</td>
|
||||
<td>55</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student05</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>68</td>
|
||||
<td>80</td>
|
||||
<td>95</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student06</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>99</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student07</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>85</td>
|
||||
<td>68</td>
|
||||
<td>90</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student08</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td>90</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student09</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>80</td>
|
||||
<td>50</td>
|
||||
<td>65</td>
|
||||
<td>75</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student10</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>85</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student11</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>86</td>
|
||||
<td>85</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student12</td>
|
||||
<td>Mathematics</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>75</td>
|
||||
<td>70</td>
|
||||
<td>85</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student13</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>80</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student14</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>50</td>
|
||||
<td>45</td>
|
||||
<td>55</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student15</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>95</td>
|
||||
<td>35</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student16</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>100</td>
|
||||
<td>50</td>
|
||||
<td>30</td>
|
||||
<td>70</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student17</td>
|
||||
<td>Languages</td>
|
||||
<td>female</td>
|
||||
<td>80</td>
|
||||
<td>100</td>
|
||||
<td>55</td>
|
||||
<td>65</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student18</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>30</td>
|
||||
<td>49</td>
|
||||
<td>55</td>
|
||||
<td>75</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student19</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>68</td>
|
||||
<td>90</td>
|
||||
<td>88</td>
|
||||
<td>70</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student20</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>40</td>
|
||||
<td>45</td>
|
||||
<td>40</td>
|
||||
<td>80</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student21</td>
|
||||
<td>Languages</td>
|
||||
<td>male</td>
|
||||
<td>50</td>
|
||||
<td>45</td>
|
||||
<td>100</td>
|
||||
<td>100</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Student22</td>
|
||||
<td>Mathematics</td>
|
||||
<td>male</td>
|
||||
<td>100</td>
|
||||
<td>99</td>
|
||||
<td>100</td>
|
||||
<td>90</td>
|
||||
<td><button type="button" class="remove" title="Remove this row">X</button></td>
|
||||
</tr>
|
||||
<tr><td>Student01</td><td>Languages</td><td>male</td><td>80</td><td>70</td><td>75</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student02</td><td>Mathematics</td><td>male</td><td>90</td><td>88</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student03</td><td>Languages</td><td>female</td><td>85</td><td>95</td><td>80</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student04</td><td>Languages</td><td>male</td><td>60</td><td>55</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student05</td><td>Languages</td><td>female</td><td>68</td><td>80</td><td>95</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student06</td><td>Mathematics</td><td>male</td><td>100</td><td>99</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student07</td><td>Mathematics</td><td>male</td><td>85</td><td>68</td><td>90</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student08</td><td>Languages</td><td>male</td><td>100</td><td>90</td><td>90</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student09</td><td>Mathematics</td><td>male</td><td>80</td><td>50</td><td>65</td><td>75</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student10</td><td>Languages</td><td>male</td><td>85</td><td>100</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student11</td><td>Languages</td><td>male</td><td>86</td><td>85</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student12</td><td>Mathematics</td><td>female</td><td>100</td><td>75</td><td>70</td><td>85</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student13</td><td>Languages</td><td>female</td><td>100</td><td>80</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student14</td><td>Languages</td><td>female</td><td>50</td><td>45</td><td>55</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student15</td><td>Languages</td><td>male</td><td>95</td><td>35</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student16</td><td>Languages</td><td>female</td><td>100</td><td>50</td><td>30</td><td>70</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student17</td><td>Languages</td><td>female</td><td>80</td><td>100</td><td>55</td><td>65</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student18</td><td>Mathematics</td><td>male</td><td>30</td><td>49</td><td>55</td><td>75</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student19</td><td>Languages</td><td>male</td><td>68</td><td>90</td><td>88</td><td>70</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student20</td><td>Mathematics</td><td>male</td><td>40</td><td>45</td><td>40</td><td>80</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student21</td><td>Languages</td><td>male</td><td>50</td><td>45</td><td>100</td><td>100</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student22</td><td>Mathematics</td><td>male</td><td>100</td><td>99</td><td>100</td><td>90</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student23</td><td>Mathematics</td><td>male</td><td>82</td><td>77</td><td>0</td><td>79</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student24</td><td>Languages</td><td>female</td><td>100</td><td>91</td><td>13</td><td>82</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
<tr><td>Student25</td><td>Mathematics</td><td>male</td><td>22</td><td>96</td><td>82</td><td>53</td><td><button type="button" class="remove" title="Remove this row">X</button></td></tr>
|
||||
|
@ -204,7 +204,6 @@ tsp = ts.pager = {
|
||||
|
||||
initComplete: function(table, c){
|
||||
var p = c.pager;
|
||||
tsp.changeHeight(table, c);
|
||||
tsp.bindEvents(table, c);
|
||||
tsp.setPageSize(table, 0, c); // page size 0 is ignored
|
||||
|
||||
@ -237,12 +236,10 @@ tsp = ts.pager = {
|
||||
// make sure we have a copy of all table rows once the cache has been built
|
||||
tsp.updateCache(table);
|
||||
}
|
||||
// update page display first, so we update p.filteredPages
|
||||
tsp.updatePageDisplay(table, c, false);
|
||||
// tsp.moveToPage(table, p, false); <-- called when applyWidgets is triggered
|
||||
c.pager.last.page = -1;
|
||||
c.$table.trigger('applyWidgets');
|
||||
tsp.fixHeight(table, c);
|
||||
tsp.updatePageDisplay(table, c, false);
|
||||
}
|
||||
})
|
||||
.on('disable.pager', function(e){
|
||||
@ -261,7 +258,6 @@ tsp = ts.pager = {
|
||||
e.stopPropagation();
|
||||
// table can be unintentionally undefined in tablesorter v2.17.7 and earlier
|
||||
if (!table || triggered) { return; }
|
||||
tsp.fixHeight(table, c);
|
||||
var $rows = c.$tbodies.eq(0).children('tr').not(c.selectorRemove);
|
||||
p.totalRows = $rows.length - ( c.widgetOptions.pager_countChildRows ? 0 : $rows.filter('.' + c.cssChildRow).length );
|
||||
p.totalPages = Math.ceil( p.totalRows / p.size );
|
||||
@ -269,8 +265,12 @@ tsp = ts.pager = {
|
||||
// make a copy of all table rows once the cache has been built
|
||||
tsp.updateCache(table);
|
||||
}
|
||||
tsp.updatePageDisplay(table, c);
|
||||
if ( p.page >= p.totalPages ) {
|
||||
tsp.moveToLastPage(table, p);
|
||||
}
|
||||
tsp.hideRows(table, c);
|
||||
tsp.changeHeight(table, c);
|
||||
tsp.updatePageDisplay(table, c);
|
||||
// make sure widgets are applied - fixes #450
|
||||
c.$table.trigger('applyWidgets');
|
||||
})
|
||||
@ -371,7 +371,7 @@ tsp = ts.pager = {
|
||||
},
|
||||
|
||||
updatePageDisplay: function(table, c, completed) {
|
||||
var s, t, $out, regex,
|
||||
var s, t, $out,
|
||||
wo = c.widgetOptions,
|
||||
p = c.pager,
|
||||
sz = p.size || 10; // don't allow dividing by zero
|
||||
@ -418,7 +418,7 @@ tsp = ts.pager = {
|
||||
t += '<option value="' + opt + '">' + opt + '</option>';
|
||||
});
|
||||
// innerHTML doesn't work in IE9 - http://support2.microsoft.com/kb/276228
|
||||
p.$goto.html(t).val( p.page + 1 );;
|
||||
p.$goto.html(t).val( p.page + 1 );
|
||||
}
|
||||
// rebind startRow/page inputs
|
||||
$out.find('.ts-startRow, .ts-page').off('change').on('change', function(){
|
||||
@ -429,6 +429,7 @@ tsp = ts.pager = {
|
||||
}
|
||||
}
|
||||
tsp.pagerArrows(c);
|
||||
tsp.fixHeight(table, c);
|
||||
if (p.initialized && completed !== false) {
|
||||
c.$table.trigger('pagerComplete', c);
|
||||
// save pager info to storage
|
||||
@ -508,22 +509,26 @@ tsp = ts.pager = {
|
||||
p = c.pager,
|
||||
wo = c.widgetOptions,
|
||||
$b = c.$tbodies.eq(0);
|
||||
if (wo.pager_fixedHeight) {
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
if (wo.pager_fixedHeight && !p.isDisabled) {
|
||||
h = $.data(table, 'pagerSavedHeight');
|
||||
if (h) {
|
||||
d = h - $b.height();
|
||||
if ( d > 5 && $.data(table, 'pagerLastSize') === p.size && $b.children('tr:visible').length < p.size ) {
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + wo.pager_selectors.remove.replace(/^(\w+\.)/g,'') + '" style="height:' + d + 'px;"></tr>');
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '" style="height:' + d + 'px;"></tr>');
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
changeHeight: function(table, c) {
|
||||
var $b = c.$tbodies.eq(0);
|
||||
var h, $b = c.$tbodies.eq(0);
|
||||
$b.find('tr.pagerSavedHeightSpacer').remove();
|
||||
$.data(table, 'pagerSavedHeight', $b.height());
|
||||
if (!$b.children('tr:visible').length) {
|
||||
$b.append('<tr class="pagerSavedHeightSpacer ' + c.selectorRemove.slice(1) + '"><td> </td></tr>');
|
||||
}
|
||||
h = $b.children('tr').eq(0).height() * c.pager.size;
|
||||
$.data(table, 'pagerSavedHeight', h);
|
||||
tsp.fixHeight(table, c);
|
||||
$.data(table, 'pagerLastSize', c.pager.size);
|
||||
},
|
||||
@ -677,7 +682,6 @@ tsp = ts.pager = {
|
||||
p.last.currentFilters = p.currentFilters;
|
||||
p.last.sortList = (c.sortList || []).join(',');
|
||||
tsp.updatePageDisplay(table, c);
|
||||
tsp.fixHeight(table, c);
|
||||
$t.trigger('updateCache', [function(){
|
||||
if (p.initialized) {
|
||||
// apply widgets after table has rendered & after a delay to prevent
|
||||
@ -815,7 +819,6 @@ tsp = ts.pager = {
|
||||
}
|
||||
|
||||
tsp.updatePageDisplay(table, c);
|
||||
if ( !p.isDisabled ) { tsp.fixHeight(table, c); }
|
||||
|
||||
wo.pager_startPage = p.page;
|
||||
wo.pager_size = p.size;
|
||||
@ -882,7 +885,7 @@ tsp = ts.pager = {
|
||||
}
|
||||
var pg, c = table.config,
|
||||
wo = c.widgetOptions,
|
||||
l = p.last
|
||||
l = p.last;
|
||||
tsp.calcFilters(table, c);
|
||||
pg = Math.min( p.totalPages, p.filteredPages );
|
||||
if ( p.page < 0 ) { p.page = 0; }
|
||||
@ -994,11 +997,11 @@ tsp = ts.pager = {
|
||||
p.$container.find(c.widgetOptions.pager_selectors.pageDisplay).attr('id', info);
|
||||
c.$table.attr('aria-describedby', info);
|
||||
}
|
||||
tsp.changeHeight(table, c);
|
||||
if ( triggered ) {
|
||||
c.$table.trigger('updateRows');
|
||||
tsp.setPageSize(table, p.size, c);
|
||||
tsp.hideRowsSetup(table, c);
|
||||
tsp.fixHeight(table, c);
|
||||
if (c.debug) {
|
||||
ts.log('pager enabled');
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user