Skip to content

Commit 9c36d99

Browse files
committed
Upgrade tablesorter to 2.7.3.
1 parent 73f51c8 commit 9c36d99

17 files changed

+176
-153
lines changed

CHANGELOG.markdown

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changelog
22
===
3+
#### v1.4.0
4+
5+
* Upgrade tablesorter to v2.7.3
6+
37
#### v1.3.0
48

59
* Upgrade tablesorter to v2.6.2

README.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Simple integration of jquery-tablesorter into the asset pipeline.
66

7-
Current tablesorter version: 2.6.2 (12/20/2012), [documentation]
7+
Current tablesorter version: 2.7.3 (1/10/2013), [documentation]
88

99
Any issue associate with the js/css files, please report to [Mottie's fork].
1010

vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* tablesorter pager plugin
3-
* updated 12/20/2012
3+
* updated 1/4/2013
44
*/
55
/*jshint browser:true, jquery:true, unused:false */
66
;(function($) {
@@ -94,7 +94,7 @@
9494

9595
updatePageDisplay = function(table, c) {
9696
var i, p, s, t, out, f = $(table).hasClass('hasFilters') && !c.ajaxUrl;
97-
c.filteredRows = (f) ? $(table).find('tbody tr:not(.filtered)').length : c.totalRows;
97+
c.filteredRows = (f) ? table.config.$tbodies.children('tr:not(.filtered,.remove-me)').length : c.totalRows;
9898
c.filteredPages = (f) ? Math.ceil( c.filteredRows / c.size ) : c.totalPages;
9999
if ( Math.min( c.totalPages, c.filteredPages ) > 0 ) {
100100
t = (c.size * c.page > c.filteredRows);
@@ -138,7 +138,7 @@
138138
if (h) {
139139
d = h - $b.height();
140140
if ( d > 5 && $.data(table, 'pagerLastSize') === c.size && $b.children('tr:visible').length < c.size ) {
141-
$b.append('<tr class="pagerSavedHeightSpacer remove-me" style="height:' + d + 'px;"></tr>');
141+
$b.append('<tr class="pagerSavedHeightSpacer ' + table.config.selectorRemove.replace('.','') + '" style="height:' + d + 'px;"></tr>');
142142
}
143143
}
144144
}
@@ -188,9 +188,9 @@
188188
var i, j, hsh, $f, $sh,
189189
$t = $(table),
190190
tc = table.config,
191-
$b = $(table.tBodies).filter(':not(.' + tc.cssInfoBlock + ')'),
191+
$b = c.$tbodies,
192192
hl = $t.find('thead th').length, tds = '',
193-
err = '<tr class="' + c.cssErrorRow + ' ' + tc.selectorRemove + '"><td style="text-align: center;" colspan="' + hl + '">' +
193+
err = '<tr class="' + c.cssErrorRow + ' ' + tc.selectorRemove.replace('.','') + '"><td style="text-align: center;" colspan="' + hl + '">' +
194194
(exception ? exception.message + ' (' + exception.name + ')' : 'No rows found') + '</td></tr>',
195195
result = c.ajaxProcessing(data) || [ 0, [] ],
196196
d = result[1] || [],
@@ -302,6 +302,7 @@
302302
},
303303

304304
renderTable = function(table, rows, c) {
305+
c.isDisabled = false; // needed because sorting will change the page and re-enable the pager
305306
var i, j, o,
306307
f = document.createDocumentFragment(),
307308
l = rows.length,
@@ -454,19 +455,20 @@
454455
$t
455456
.unbind('filterStart.pager filterEnd.pager sortEnd.pager disable.pager enable.pager destroy.pager update.pager')
456457
.bind('filterStart.pager', function(e, filters) {
458+
$.data(table, 'pagerUpdateTriggered', false);
457459
c.currentFilters = filters;
458460
})
459461
// update pager after filter widget completes
460-
.bind('filterEnd.pager sortEnd.pager', function() {
462+
.bind('filterEnd.pager sortEnd.pager', function(e) {
461463
//Prevent infinite event loops from occuring by setting this in all moveToPage calls and catching it here.
462464
if ($.data(table, 'pagerUpdateTriggered')) {
463465
$.data(table, 'pagerUpdateTriggered', false);
464466
return;
465467
}
466-
c.page = 0;
468+
if (e.type === 'filterEnd') { c.page = 0; }
467469
updatePageDisplay(table, c);
468470
moveToPage(table, c);
469-
changeHeight(table, c);
471+
fixHeight(table, c);
470472
})
471473
.bind('disable.pager', function(){
472474
showAllRows(table, c);
@@ -544,6 +546,8 @@
544546
hideRowsSetup(table, c);
545547
}
546548

549+
changeHeight(table, c);
550+
547551
// pager initialized
548552
if (!c.ajax) {
549553
c.initialized = true;

0 commit comments

Comments
 (0)