library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-10-08 13:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pager: destroyPager reveals all rows. Fixes #1055

Browse Source 
Partial reversion of 285cef1e70
This commit is contained in:
Rob Garrison 2015-10-27 17:31:50 -05:00
parent 85997765d7
commit 94c2ce700a
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/pager/jquery.tablesorter.pager.js
View File

@ -620,7 +620,7 @@
} }
$t.trigger( 'pagerChange', p ); $t.trigger( 'pagerChange', p );
} }
if ( !p.removeRows && !p.showAll ) { if ( !p.removeRows ) {
hideRows(table, p); hideRows(table, p);
} else { } else {
ts.clearTableBody(table); ts.clearTableBody(table);
@ -662,7 +662,6 @@
p.page = 0; p.page = 0;
p.size = p.totalRows; p.size = p.totalRows;
p.totalPages = 1; p.totalPages = 1;
p.showAll = true;
$(table) $(table)
.addClass('pagerDisabled') .addClass('pagerDisabled')
.removeAttr('aria-describedby') .removeAttr('aria-describedby')
@ -837,7 +836,6 @@
.removeAttr('disabled') .removeAttr('disabled')
.attr('aria-disabled', 'false'); .attr('aria-disabled', 'false');
p.isDisabled = false; p.isDisabled = false;
p.showAll = false;
p.page = $.data(table, 'pagerLastPage') || p.page || 0; p.page = $.data(table, 'pagerLastPage') || p.page || 0;
size = p.$size.find('option[selected]').val(); size = p.$size.find('option[selected]').val();
p.size = $.data(table, 'pagerLastSize') || parsePageSize( p, size, 'get' ) || p.size || p.settings.size || 10; p.size = $.data(table, 'pagerLastSize') || parsePageSize( p, size, 'get' ) || p.size || p.settings.size || 10;
@ -896,7 +894,6 @@
p.oldAjaxSuccess = p.oldAjaxSuccess || p.ajaxObject.success; p.oldAjaxSuccess = p.oldAjaxSuccess || p.ajaxObject.success;
c.appender = $this.appender; c.appender = $this.appender;
p.initializing = true; p.initializing = true;
p.showAll = false;
if (p.savePages && ts.storage) { if (p.savePages && ts.storage) {
t = ts.storage(table, p.storageKey) || {}; // fixes #387 t = ts.storage(table, p.storageKey) || {}; // fixes #387
p.page = isNaN(t.page) ? p.page : t.page; p.page = isNaN(t.page) ? p.page : t.page;

2
dist/js/extras/jquery.tablesorter.pager.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/widgets/widget-pager.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
js/widgets/widget-pager.js
View File

@ -129,7 +129,7 @@
init: function(table) { init: function(table) {
// check if tablesorter has initialized // check if tablesorter has initialized
if (table.hasInitialized && table.config.pager.initialized) { return; } if (table.hasInitialized && table.config.pager && table.config.pager.initialized) { return; }
var t, var t,
c = table.config, c = table.config,
wo = c.widgetOptions, wo = c.widgetOptions,
@ -171,7 +171,6 @@
p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success; p.oldAjaxSuccess = p.oldAjaxSuccess || wo.pager_ajaxObject.success;
c.appender = tsp.appender; c.appender = tsp.appender;
p.initializing = true; p.initializing = true;
p.showAll = false;
if (wo.pager_savePages && ts.storage) { if (wo.pager_savePages && ts.storage) {
t = ts.storage(table, wo.pager_storageKey) || {}; // fixes #387 t = ts.storage(table, wo.pager_storageKey) || {}; // fixes #387
p.page = ( isNaN(t.page) ? p.page : t.page ) || p.setPage || 0; p.page = ( isNaN(t.page) ? p.page : t.page ) || p.setPage || 0;
@ -271,7 +270,8 @@
}) })
.on('destroyPager' + namespace, function(e, refreshing){ .on('destroyPager' + namespace, function(e, refreshing){
e.stopPropagation(); e.stopPropagation();
tsp.destroyPager(table, c, refreshing); // call removeWidget to make sure internal flags are modified.
ts.removeWidget( table, 'pager', false );
}) })
.on('updateComplete' + namespace, function(e, table, triggered){ .on('updateComplete' + namespace, function(e, table, triggered){
e.stopPropagation(); e.stopPropagation();
@ -884,7 +884,7 @@
} }
c.$table.trigger( 'pagerChange', c ); c.$table.trigger( 'pagerChange', c );
} }
if ( !wo.pager_removeRows && !p.showAll ) { if ( !wo.pager_removeRows ) {
tsp.hideRows(table, c); tsp.hideRows(table, c);
} else { } else {
ts.clearTableBody(table); ts.clearTableBody(table);
@ -932,7 +932,6 @@
p.page = 0; p.page = 0;
p.size = p.totalRows; p.size = p.totalRows;
p.totalPages = 1; p.totalPages = 1;
p.showAll = true;
c.$table c.$table
.addClass('pagerDisabled') .addClass('pagerDisabled')
.removeAttr('aria-describedby') .removeAttr('aria-describedby')
@ -1117,7 +1116,6 @@
var info, size, var info, size,
p = c.pager; p = c.pager;
p.isDisabled = false; p.isDisabled = false;
p.showAll = false;
p.page = $.data(table, 'pagerLastPage') || p.page || 0; p.page = $.data(table, 'pagerLastPage') || p.page || 0;
size = p.$size.find('option[selected]').val(); size = p.$size.find('option[selected]').val();
p.size = $.data(table, 'pagerLastSize') || tsp.parsePageSize( p, size, 'get' ) || p.size || p.setSize || 10; p.size = $.data(table, 'pagerLastSize') || tsp.parsePageSize( p, size, 'get' ) || p.size || p.setSize || 10;