From e9afa984d41b2e7f86dbfa70638ede2943e8da91 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Sat, 28 May 2011 11:17:31 +0100 Subject: [PATCH] Fix: When using server-side processing the new sLoadingRecords message is not used since the draw doesn't progress that far. As a result the same issue as was fixed in commit cc1908baaff6df0efb65088a41522af4ad91a5fb could occur and needs to be addressed here by checking for server-side processing. Regression picked up by unit tests --- media/js/jquery.dataTables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index f86a62dc..c4b3e6b4 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -3296,7 +3296,7 @@ var sZero = oSettings.oLanguage.sZeroRecords.replace( '_MAX_', oSettings.fnFormatNumber(oSettings.fnRecordsTotal()) ); - if ( oSettings.iDraw == 1 && oSettings.sAjaxSource !== null ) + if ( oSettings.iDraw == 1 && oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide ) { sZero = oSettings.oLanguage.sLoadingRecords; }