From 744155653eb03afdcf99c9bbaf5a5f66a708c3c2 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Sun, 11 Jan 2015 16:27:15 +0000 Subject: [PATCH] New: `dt-init ajax.data` can return a string to be used as the request body. This is useful for submitting a JSON string to the server. * This is actually compatible with 1.10.0+ but was never documented (it wasn't an intended feature, but rather an implementation detail. It is rather useful though, so is now documented. --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 74336dd3..cb169aaa 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -d7a9a1e813f273d6767fd5b140b6017978e7f584 +381e161bffbd1ae65e07d0a6eaca08b5237f09b2 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 49a4028a..1ee0652f 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -2424,7 +2424,7 @@ ajaxData( data ) : // fn can manipulate data or return an object ajaxData; // object or array to merge - // If the function returned an object, use that alone + // If the function returned something, use that alone data = $.isFunction( ajaxData ) && newData ? newData : $.extend( true, data, newData );