library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #626 from JuarezTurrini/master

Browse Source 
Pager: Passing jqxhr for ajaxProcessing function.
This commit is contained in:
Rob G 2014-05-26 17:00:51 -05:00
commit d14f061312
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@
// Save pager page & size if the storage script is loaded (requires $.tablesorter.storage in jquery.tablesorter.widgets.js) // Save pager page & size if the storage script is loaded (requires $.tablesorter.storage in jquery.tablesorter.widgets.js)
savePages: true, savePages: true,
// defines custom storage key // defines custom storage key
storageKey: 'tablesorter-pager', storageKey: 'tablesorter-pager',
@ -271,7 +271,7 @@
c = table.config, c = table.config,
$t = c.$table, $t = c.$table,
tds = '', tds = '',
result = p.ajaxProcessing(data, table) || [ 0, [] ], result = p.ajaxProcessing(data, table, xhr) || [ 0, [] ],
hl = $t.find('thead th').length; hl = $t.find('thead th').length;
// Clean up any previous error. // Clean up any previous error.
@ -401,12 +401,12 @@
counter = ++p.ajaxCounter; counter = ++p.ajaxCounter;
p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl p.ajaxObject.url = url; // from the ajaxUrl option and modified by customAjaxUrl
p.ajaxObject.success = function(data) { p.ajaxObject.success = function(data, status, jqxhr) {
// Refuse to process old ajax commands that were overwritten by new ones - see #443 // Refuse to process old ajax commands that were overwritten by new ones - see #443
if (counter < p.ajaxCounter){ if (counter < p.ajaxCounter){
return; return;
} }
renderAjax(data, table, p); renderAjax(data, table, p, jqxhr);
$doc.unbind('ajaxError.pager'); $doc.unbind('ajaxError.pager');
if (typeof p.oldAjaxSuccess === 'function') { if (typeof p.oldAjaxSuccess === 'function') {
p.oldAjaxSuccess(data); p.oldAjaxSuccess(data);
@ -484,7 +484,7 @@
// if filtered, start from zero // if filtered, start from zero
index = f ? 0 : s; index = f ? 0 : s;
count = f ? 0 : s; count = f ? 0 : s;
added = 0; added = 0;
while (added < e && index < rows.length) { while (added < e && index < rows.length) {
if (!f || !/filtered/.test(rows[index][0].className)){ if (!f || !/filtered/.test(rows[index][0].className)){
count++; count++;