datatables.net 2.3.0 → 2.3.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.3.0
+/*! DataTables 2.3.2
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -77,7 +77,7 @@ var DataTable = function ( selector, options )
 		_fnCamelToHungarian( defaults.column, defaults.column, true );
 		
 		/* Setting up the initialisation object */
-		_fnCamelToHungarian( defaults, $.extend( oInit, $this.data() ), true );
+		_fnCamelToHungarian( defaults, $.extend( oInit, _fnEscapeObject($this.data()) ), true );
 		
 		
 		
@@ -507,6 +507,11 @@ DataTable.ext = _ext = {
 	 */
 	errMode: "alert",
 
+	/** HTML entity escaping */
+	escape: {
+		/** When reading data-* attributes for initialisation options */
+		attributes: false
+	},
 
 	/**
 	 * Legacy so v1 plug-ins don't throw js errors on load
@@ -1871,6 +1876,10 @@ function _fnCompatOpts ( init )
 		init.orderIndicators = false;
 		init.orderHandler = false;
 	}
+	else if (init.bSort === true) {
+		init.orderIndicators = true;
+		init.orderHandler = true;
+	}
 
 	// Which cells are the title cells?
 	if (typeof init.bSortCellsTop === 'boolean') {
@@ -3538,7 +3547,9 @@ function _fnReDraw( settings, holdPosition, recompute )
 
 	_fnDraw( settings );
 
-	settings._drawHold = false;
+	settings.api.one('draw', function () {
+		settings._drawHold = false;
+	});
 }
 
 
@@ -3972,7 +3983,7 @@ function _fnDetectHeader ( settings, thead, write )
 				if ( write ) {
 					if (unique) {
 						// Allow column options to be set from HTML attributes
-						_fnColumnOptions( settings, shifted, jqCell.data() );
+						_fnColumnOptions( settings, shifted, _fnEscapeObject(jqCell.data()) );
 						
 						// Get the width for the column. This can be defined from the
 						// width attribute, style attribute or `columns.width` option
@@ -4218,7 +4229,7 @@ function _fnBuildAjax( oSettings, data, fn )
 		// to the object for the callback.
 		var empty = {};
 
-		DataTable.util.set(ajax.dataSrc)(empty, []);
+		_fnAjaxDataSrc(oSettings, empty, []);
 		callback(empty);
 	}
 	else {
@@ -5746,9 +5757,11 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
 		var run = false;
 		var columns = column === undefined
 			? _fnColumnsFromHeader( e.target )
-			: Array.isArray(column)
-				? column
-				: [column];
+			: typeof column === 'function'
+				? column()
+				: Array.isArray(column)
+					? column
+					: [column];
 
 		if ( columns.length ) {
 			for ( var i=0, ien=columns.length ; i<ien ; i++ ) {
@@ -6813,6 +6826,19 @@ function _fnListener(that, name, src) {
 	}
 }
 
+/**
+ * Escape HTML entities in strings, in an object
+ */
+function _fnEscapeObject(obj) {
+	if (DataTable.ext.escape.attributes) {
+		$.each(obj, function (key, val) {
+			obj[key] = _escapeHtml(val);
+		})
+	}
+
+	return obj;
+}
+
 
 
 /**
@@ -10158,7 +10184,7 @@ function cleanHeader(node, className) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.3.0";
+DataTable.version = "2.3.2";
 
 /**
  * Private data store, containing all of the settings objects that are

package/package.json

@@ -4,7 +4,7 @@
     "main": "js/dataTables.js",
     "module": "js/dataTables.mjs",
     "types": "./types/types.d.ts",
-    "version": "2.3.0",
+    "version": "2.3.2",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",

package/types/types.d.ts

@@ -1633,7 +1633,11 @@ export interface ApiOrder {
      * @param callback Callback function
      * @returns DataTables API instance with the current order in the result set
      */
-    listener(node: string | Node | JQuery, column: number, callback: (() => void)): Api<any>;
+    listener(
+        node: string | Node | JQuery,
+        column: HTMLElement | number | number[] | (() => number[]),
+        callback: (() => void)
+    ): Api<any>;
 }
 
 export interface ApiState<T> {
@@ -3152,6 +3156,9 @@ export interface DataTablesStaticExt {
     ccContent: IColumnControlContent;
     classes: ExtClassesSettings;
     errMode: string;
+    escape: {
+        attributes: boolean;
+    };
     feature: any[];
     iApiIndex: number;
     internal: object;
@@ -3405,7 +3412,7 @@ type FunctionPreDrawCallback = (this: JQueryDataTables, settings: InternalSettin
 
 type FunctionRowCallback = (this: JQueryDataTables, row: HTMLTableRowElement, data: any[] | object, index: number) => void;
 
-type FunctionStateLoadCallback = (this: JQueryDataTables, settings: InternalSettings, callback: ((state) => void)) => void | object;
+type FunctionStateLoadCallback = (this: JQueryDataTables, settings: InternalSettings, callback: ((state: State) => void)) => void | object;
 
 type FunctionStateLoaded = (this: JQueryDataTables, settings: InternalSettings, data: object) => void;