From ce54ab1ea5779ca7076d487f233a3b8bea99451d Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 14 Mar 2014 12:31:43 +0000 Subject: [PATCH] Fix: ajax.reload() wasn't showing the processing display --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index c45eaac1..a5852dc7 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -8365a01e098ce80a9ae8f63110456f6a88628340 +d20dec838ba326158bc662d09b10d1f18b16e7b5 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 139a630c..9d6543c8 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -7082,8 +7082,9 @@ } else { // Trigger xhr + _fnProcessingDisplay( settings, true ); + _fnBuildAjax( settings, [], function( json ) { - // xxx can this be reduced? _fnClearTable( settings ); var data = _fnAjaxDataSrc( settings, json ); @@ -7092,6 +7093,7 @@ } _fnReDraw( settings, holdPosition ); + _fnProcessingDisplay( settings, false ); } ); } @@ -7101,7 +7103,6 @@ var api = new _Api( settings ); api.one( 'draw', function () { - console.log( api.ajax.json() ); callback( api.ajax.json() ); } ); }