From 15c7628d1c423ba4bb33d2c9dac92d88d81e86bf Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 17 Mar 2011 19:00:57 +0000 Subject: [PATCH] New: Extend the new defered loading option to consider Ajax sourced data without server-side processing. --- media/js/jquery.dataTables.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 6f93b374..7fba610f 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -2313,7 +2313,7 @@ */ function _fnInitalise ( oSettings ) { - var i, iLen; + var i, iLen, bDefer=oSettings.bDeferLoading; /* Ensure that the table data is fully initialised */ if ( oSettings.bInitialised === false ) @@ -2361,7 +2361,7 @@ } /* if there is an ajax source load the data */ - if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide ) + if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide && !bDefer ) { oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, [], function(json) { /* Got the data - add it to the table */