datatables.net 2.0.4 → 2.0.6

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.0.4
+/*! DataTables 2.0.6
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -2592,9 +2592,15 @@ function _fnGetCellData( settings, rowIdx, colIdx, type )
 		type = 'sort';
 	}
 
+	var row = settings.aoData[rowIdx];
+
+	if (! row) {
+		return undefined;
+	}
+
 	var draw           = settings.iDraw;
 	var col            = settings.aoColumns[colIdx];
-	var rowData        = settings.aoData[rowIdx]._aData;
+	var rowData        = row._aData;
 	var defaultContent = col.sDefaultContent;
 	var cellData       = col.fnGetData( rowData, type, {
 		settings: settings,
@@ -4363,6 +4369,7 @@ function _fnFilter( searchRows, settings, input, options, column )
 	}
 
 	var i = 0;
+	var matched = [];
 
 	// Search term can be a function, regex or string - if a string we apply our
 	// smart filtering regex (assuming the options require that)
@@ -4374,18 +4381,22 @@ function _fnFilter( searchRows, settings, input, options, column )
 			: _fnFilterCreateSearch( input, options );
 
 	// Then for each row, does the test pass. If not, lop the row from the array
-	while (i < searchRows.length) {
+	for (i=0 ; i<searchRows.length ; i++) {
 		var row = settings.aoData[ searchRows[i] ];
 		var data = column === undefined
 			? row._sFilterRow
 			: row._aFilterData[ column ];
 
-		if ( (searchFunc && ! searchFunc(data, row._aData, searchRows[i], column)) || (rpSearch && ! rpSearch.test(data)) ) {
-			searchRows.splice(i, 1);
-			i--;
+		if ( (searchFunc && searchFunc(data, row._aData, searchRows[i], column)) || (rpSearch && rpSearch.test(data)) ) {
+			matched.push(searchRows[i]);
 		}
+	}
 
-		i++;
+	// Mutate the searchRows array
+	searchRows.length = matched.length;
+
+	for (i=0 ; i<matched.length ; i++) {
+		searchRows[i] = matched[i];
 	}
 }
 
@@ -4753,6 +4764,7 @@ function _fnPageChange ( settings, action, redraw )
 function _processingHtml ( settings )
 {
 	var table = settings.nTable;
+	var scrolling = settings.oScroll.sX !== '' || settings.oScroll.sY !== '';
 
 	if ( settings.oFeatures.bProcessing ) {
 		var n = $('<div/>', {
@@ -4761,9 +4773,16 @@ function _processingHtml ( settings )
 				'role': 'status'
 			} )
 			.html( settings.oLanguage.sProcessing )
-			.append('<div><div></div><div></div><div></div><div></div></div>')
-			.insertBefore( table );
-		
+			.append('<div><div></div><div></div><div></div><div></div></div>');
+
+		// Different positioning depending on if scrolling is enabled or not
+		if (scrolling) {
+			n.prependTo( 'div.dt-scroll', settings.nTableWrapper );
+		}
+		else {
+			n.insertBefore( table );
+		}
+
 		$(table).on( 'processing.dt.DT', function (e, s, show) {
 			n.css( 'display', show ? 'block' : 'none' );
 		} );
@@ -5007,7 +5026,7 @@ function _fnScrollDraw ( settings )
 	// of the indexes out.
 	if (settings.aiDisplay.length) {
 		// Get the column sizes from the first row in the table
-		var colSizes = table.find('tbody tr').eq(0).find('th, td').map(function (vis) {
+		var colSizes = table.children('tbody > tr').eq(0).children('th, td').map(function (vis) {
 			return {
 				idx: _fnVisibleToColumnIndex(settings, vis),
 				width: $(this).outerWidth()
@@ -5451,6 +5470,10 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
  * @param {*} settings
  */
 function _fnSortDisplay(settings, display) {
+	if (display.length < 2) {
+		return;
+	}
+
 	var master = settings.aiDisplayMaster;
 	var masterMap = {};
 	var map = {};
@@ -7753,11 +7776,6 @@ _api_registerPlural( 'rows().remove()', 'row().remove()', function () {
 			settings.aiDisplayMaster.splice(idx, 1);
 		}
 
-		idx = settings.aiDisplay.indexOf(row);
-		if (idx !== -1) {
-			settings.aiDisplay.splice(idx, 1);
-		}
-
 		// For server-side processing tables - subtract the deleted row from the count
 		if ( settings._iRecordsDisplay > 0 ) {
 			settings._iRecordsDisplay--;
@@ -7847,9 +7865,15 @@ _api_register( 'row().data()', function ( data ) {
 _api_register( 'row().node()', function () {
 	var ctx = this.context;
 
-	return ctx.length && this.length && this[0].length ?
-		ctx[0].aoData[ this[0] ].nTr || null :
-		null;
+	if (ctx.length && this.length && this[0].length) {
+		var row = ctx[0].aoData[ this[0] ];
+
+		if (row && row.nTr) {
+			return row.nTr;
+		}
+	}
+
+	return null;
 } );
 
 
@@ -7908,8 +7932,9 @@ var __details_state_load = function (api, state)
 	if ( state && state.childRows ) {
 		api
 			.rows( state.childRows.map(function (id) {
-				// Escape any `:` characters from the row id, unless previously escaped
-				return id.replace(/(?<!\\):/g, '\\:');
+				// Escape any `:` characters from the row id. Accounts for
+				// already escaped characters.
+				return id.replace(/([^:\\]*(?:\\.[^:\\]*)*):/g, "$1\\:");
 			}) )
 			.every( function () {
 				_fnCallbackFire( api.settings()[0], null, 'requestChild', [ this ] )
@@ -9533,7 +9558,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.0.4";
+DataTable.version = "2.0.6";
 
 /**
  * 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.0.4",
+    "version": "2.0.6",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",

package/types/types.d.ts

@@ -157,11 +157,20 @@ export interface Feature {
 
     /** Pagination buttons */
     paging?: {
+        /** Set the maximum number of paging number buttons */
+        buttons?: number;
+
         /** Paging button display options */
         type?: 'numbers' | 'simple' | 'simple_numbers' | 'full' | 'full_numbers' | 'first_last_numbers';
 
-        /** Set the maximum number of paging number buttons */
+        /**
+         * Set the maximum number of paging number buttons
+         * @deprecated Use `buttons` instead.
+         */
         numbers?: number;
+
+        /** Include the extreme page numbers, if separated by ellipsis, or not */
+        boundaryNumbers?: boolean;
     }
 
     /** Global search input */
@@ -182,7 +191,7 @@ type LayoutEdge = 'Start' | 'End';
 
 type LayoutKeys = `${LayoutSide}${LayoutNumber}${LayoutEdge}` | `${LayoutSide}${LayoutNumber}`;
 
-type Layout = Partial<Record<LayoutKeys, keyof Feature | Feature | Array<keyof Feature> | Feature[]>>;
+type Layout = Partial<Record<LayoutKeys, keyof Feature | Feature | Array<keyof Feature> | Feature[] | null>>;
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *