diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 82dfabe4..7616fb02 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -8485,6 +8485,7 @@ */ "sScrollXInner": "", + /** * Enable vertical scrolling. Vertical scrolling will constrain the DataTable * to the given height, an enable scrolling for any data which overflows the @@ -8503,7 +8504,25 @@ * } ); * } ); */ - "sScrollY": "" + "sScrollY": "", + + + /** + * Set the HTTP method that is used to make the Ajax call for server-side + * processing or Ajax sourced data. + * @type string + * @default GET + * + * @example + * $(document).ready(function() { + * $('#example').dataTable( { + * "bServerSide": true, + * "sAjaxSource": "scripts/post.php", + * "sServerMethod": "POST" + * } ); + * } ); + */ + "sServerMethod": "GET" }; diff --git a/media/src/model/model.init.columns.js b/media/src/model/model.init.columns.js index 4206de8c..4e266e09 100644 --- a/media/src/model/model.init.columns.js +++ b/media/src/model/model.init.columns.js @@ -5,6 +5,42 @@ * @namespace */ DataTable.models.oInitColumns = { + /** + * Allows a column's sorting to take multiple columns into account when + * doing a sort. For example first name / last name columns make sense to + * do a multi-column sort over the two columns. + * @type array + * @default [] Takes the value of the column index automatically + * + * @example + * // Using aoColumnDefs + * $(document).ready(function() { + * $('#example').dataTable( { + * "aoColumnDefs": [ + * { "aDataSort": [ 0, 1 ], "aTargets": [ 0 ] }, + * { "aDataSort": [ 1, 0 ], "aTargets": [ 1 ] }, + * { "aDataSort": [ 2, 3, 4 ], "aTargets": [ 2 ] } + * ] + * } ); + * } ); + * + * @example + * // Using aoColumns + * $(document).ready(function() { + * $('#example').dataTable( { + * "aoColumns": [ + * { "aDataSort": [ 0, 1 ] }, + * { "aDataSort": [ 1, 0 ] }, + * { "aDataSort": [ 2, 3, 4 ] }, + * null, + * null + * ] + * } ); + * } ); + */ + "aDataSort": [], + + /** * You can control the default sorting direction, and even alter the behaviour * of the sort handler (i.e. only allow ascending sorting etc) using this diff --git a/media/src/model/model.init.js b/media/src/model/model.init.js index e7ec321b..419e8d1b 100644 --- a/media/src/model/model.init.js +++ b/media/src/model/model.init.js @@ -1644,6 +1644,7 @@ DataTable.models.oInit = { */ "sScrollXInner": "", + /** * Enable vertical scrolling. Vertical scrolling will constrain the DataTable * to the given height, an enable scrolling for any data which overflows the @@ -1662,6 +1663,24 @@ DataTable.models.oInit = { * } ); * } ); */ - "sScrollY": "" + "sScrollY": "", + + + /** + * Set the HTTP method that is used to make the Ajax call for server-side + * processing or Ajax sourced data. + * @type string + * @default GET + * + * @example + * $(document).ready(function() { + * $('#example').dataTable( { + * "bServerSide": true, + * "sAjaxSource": "scripts/post.php", + * "sServerMethod": "POST" + * } ); + * } ); + */ + "sServerMethod": "GET" };