datatables.net 2.0.0 → 2.0.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.0.0
+/*! DataTables 2.0.2
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -264,7 +264,7 @@ var DataTable = function ( selector, options )
 					_fnCamelToHungarian( defaults.oLanguage, json );
 					$.extend( true, oLanguage, json, oSettings.oInit.oLanguage );
 		
-					_fnCallbackFire( oSettings, null, 'i18n', [oSettings]);
+					_fnCallbackFire( oSettings, null, 'i18n', [oSettings], true);
 					_fnInitialise( oSettings );
 				},
 				error: function () {
@@ -2302,7 +2302,7 @@ function _columnAutoRender(settings, colIdx) {
  */
 function _columnAutoClass(container, colIdx, className) {
 	container.forEach(function (row) {
-		if (row[colIdx].unique) {
+		if (row[colIdx] && row[colIdx].unique) {
 			_addClass(row[colIdx].cell, className);
 		}
 	});
@@ -2376,24 +2376,32 @@ function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, headerLayout, fn )
 				else if ( typeof target === 'string' )
 				{
 					for ( k=0, kLen=columns.length ; k<kLen ; k++ ) {
-						if (target.indexOf(':name') !== -1) {
+						if (target === '_all') {
+							// Apply to all columns
+							fn( k, def );
+						}
+						else if (target.indexOf(':name') !== -1) {
+							// Column selector
 							if (columns[k].sName === target.replace(':name', '')) {
 								fn( k, def );
 							}
 						}
 						else {
+							// Cell selector
 							headerLayout.forEach(function (row) {
-								var cell = $(row[k].cell);
-
-								// Legacy support. Note that it means that we don't support
-								// an element name selector only, since they are treated as
-								// class names for 1.x compat.
-								if (target.match(/^[a-z][\w-]*$/i)) {
-									target = '.' + target;
-								}
-
-								if (target === '_all' || cell.is( target )) {
-									fn( k, def );
+								if (row[k]) {
+									var cell = $(row[k].cell);
+
+									// Legacy support. Note that it means that we don't support
+									// an element name selector only, since they are treated as
+									// class names for 1.x compat.
+									if (target.match(/^[a-z][\w-]*$/i)) {
+										target = '.' + target;
+									}
+
+									if (cell.is( target )) {
+										fn( k, def );
+									}
 								}
 							});
 						}
@@ -2977,7 +2985,7 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 		for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
 		{
 			oCol = oSettings.aoColumns[i];
-			create = nTrIn ? false : true;
+			create = nTrIn && anTds[i] ? false : true;
 
 			nTd = create ? document.createElement( oCol.sCellType ) : anTds[i];
 
@@ -3006,11 +3014,11 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 			}
 
 			// Visibility - add or remove as required
-			if ( oCol.bVisible && ! nTrIn )
+			if ( oCol.bVisible && create )
 			{
 				nTr.appendChild( nTd );
 			}
-			else if ( ! oCol.bVisible && nTrIn )
+			else if ( ! oCol.bVisible && ! create )
 			{
 				nTd.parentNode.removeChild( nTd );
 			}
@@ -3094,14 +3102,23 @@ function _fnBuildHead( settings, side )
 	}
 
 	// If no cells yet and we have content for them, then create
-	if ( $('th, td', target).length === 0 && (side === 'header' || _pluck(settings.aoColumns, titleProp).join('')) ) {
-		row = $('<tr/>')
-			.appendTo( target );
+	if (side === 'header' || _pluck(settings.aoColumns, titleProp).join('')) {
+		row = $('tr', target);
 
-		for ( i=0, ien=columns.length ; i<ien ; i++ ) {
-			$('<th/>')
-				.html( columns[i][titleProp] || '' )
-				.appendTo( row );
+		// Add a row if needed
+		if (! row.length) {
+			row = $('<tr/>').appendTo(target)
+		}
+
+		// Add the number of cells needed to make up to the number of columns
+		if (row.length === 1) {
+			var cells = $('td, th', row);
+
+			for ( i=cells.length, ien=columns.length ; i<ien ; i++ ) {
+				$('<th/>')
+					.html( columns[i][titleProp] || '' )
+					.appendTo( row );
+			}
 		}
 	}
 
@@ -3198,11 +3215,15 @@ function _fnHeaderLayout( settings, source, incColumns )
 					colspan++;
 				}
 
+				var titleSpan = $('span.dt-column-title', cell);
+
 				structure[row][column] = {
 					cell: cell,
 					colspan: colspan,
 					rowspan: rowspan,
-					title: $('span.dt-column-title', cell).html()
+					title: titleSpan.length
+						? titleSpan.html()
+						: $(cell).html()
 				};
 			}
 		}
@@ -3409,8 +3430,10 @@ function _emptyRow ( settings ) {
 	var zero = oLang.sZeroRecords;
 	var dataSrc = _fnDataSource( settings );
 
-	if ( settings.iDraw <= 1 && (dataSrc === 'ajax' || dataSrc === 'ssp') )
-	{
+	if (
+		(settings.iDraw < 1 && dataSrc === 'ssp') ||
+		(settings.iDraw <= 1 && dataSrc === 'ajax')
+	) {
 		zero = oLang.sLoadingRecords;
 	}
 	else if ( oLang.sEmptyTable && settings.fnRecordsTotal() === 0 )
@@ -3456,30 +3479,34 @@ function _layoutArray ( settings, layout, side )
 			'full' :
 			splitPos[1].toLowerCase();
 		var group = groups[ splitPos[0] ];
-
-		// Transform to an object with a contents property
-		if ( $.isPlainObject( val ) ) {
-			// Already a group from a previous pass
-			if (val.contents) {
-				group[ align ] = val;
+		var groupRun = function (contents, innerVal) {
+			// If it is an object, then there can be multiple features contained in it
+			if ( $.isPlainObject( innerVal ) ) {
+				Object.keys(innerVal).map(function (key) {
+					contents.push( {
+						feature: key,
+						opts: innerVal[key]
+					});
+				});
 			}
 			else {
-				// For objects, each property becomes an entry in the contents
-				// array for this insert position
-				group[ align ] = {
-					contents: Object.keys(val).map(function (key) {
-						return {
-							feature: key,
-							opts: val[key]
-						};
-					})
-				};
+				contents.push(innerVal);
+			}
+		}
+
+		// Transform to an object with a contents property
+		if (! group[align] || ! group[align].contents) {
+			group[align] = { contents: [] };
+		}
+
+		// Allow for an array or just a single object
+		if ( Array.isArray(val)) {
+			for (var i=0 ; i<val.length ; i++) {
+				groupRun(group[align].contents, val[i]);
 			}
 		}
 		else {
-			group[ align ] = {
-				contents: val
-			};
+			groupRun(group[ align ].contents, val);
 		}
 
 		// And make contents an array
@@ -3981,7 +4008,12 @@ function _fnBuildAjax( oSettings, data, fn )
 		oSettings.jqXHR = ajax.call( instance, data, callback, oSettings );
 	}
 	else if (ajax.url === '') {
-		callback({});
+		// No url, so don't load any data. Just apply an empty data array
+		// to the object for the callback.
+		var empty = {};
+
+		DataTable.util.set(ajax.dataSrc)(empty, []);
+		callback(empty);
 	}
 	else {
 		// Object to extend the base settings
@@ -4360,6 +4392,9 @@ function _fnFilterCreateSearch( search, inOpts )
 		search = search.toString();
 	}
 
+	// Remove diacritics if normalize is set up to do so
+	search = _normalize(search);
+
 	if (options.exact) {
 		return new RegExp(
 			'^'+_fnEscapeRegex(search)+'$',
@@ -4980,12 +5015,12 @@ function _fnScrollDraw ( settings )
 	// the content of the cell so that the width applied to the header and body
 	// both match, but we want to hide it completely.
 	$('th, td', headerCopy).each(function () {
-		$(this).children().wrapAll('<div class="dt-scroll-sizing">');
+		$(this.childNodes).wrapAll('<div class="dt-scroll-sizing">');
 	});
 
 	if ( footer ) {
 		$('th, td', footerCopy).each(function () {
-			$(this).children().wrapAll('<div class="dt-scroll-sizing">');
+			$(this.childNodes).wrapAll('<div class="dt-scroll-sizing">');
 		});
 	}
 
@@ -5340,30 +5375,41 @@ function _fnSortInit( settings ) {
 
 function _fnSortAttachListener(settings, node, selector, column, callback) {
 	_fnBindAction( node, selector, function (e) {
+		var run = false;
 		var columns = column === undefined
 			? _fnColumnsFromHeader( e.target )
 			: [column];
 
 		if ( columns.length ) {
-			_fnProcessingDisplay( settings, true );
+			for ( var i=0, ien=columns.length ; i<ien ; i++ ) {
+				var ret = _fnSortAdd( settings, columns[i], i, e.shiftKey );
 
-			// Allow the processing display to show
-			setTimeout( function () {
-				for ( var i=0, ien=columns.length ; i<ien ; i++ ) {
-					var append = e.shiftKey || i > 0;
-		
-					_fnSortAdd( settings, columns[i], append );
+				if (ret !== false) {
+					run = true;
+				}					
+
+				// If the first entry is no sort, then subsequent
+				// sort columns are ignored
+				if (settings.aaSorting.length === 1 && settings.aaSorting[0][1] === '') {
+					break;
 				}
+			}
 
-				_fnSort( settings );
-				_fnSortDisplay( settings );
-				_fnReDraw( settings, false, false );
-				_fnProcessingDisplay( settings, false );
+			if (run) {
+				_fnProcessingDisplay( settings, true );
 
-				if (callback) {
-					callback();
-				}
-			}, 0);
+				// Allow the processing display to show
+				setTimeout( function () {
+					_fnSort( settings );
+					_fnSortDisplay( settings );
+					_fnReDraw( settings, false, false );
+					_fnProcessingDisplay( settings, false );
+
+					if (callback) {
+						callback();
+					}
+				}, 0);
+			}
 		}
 	} );
 }
@@ -5375,9 +5421,23 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
 function _fnSortDisplay(settings) {
 	var display = settings.aiDisplay;
 	var master = settings.aiDisplayMaster;
+	var masterMap = {};
+	var map = {};
+	var i;
 
-	display.sort(function(a, b){  
-		return master.indexOf(a) - master.indexOf(b);
+	// Rather than needing an `indexOf` on master array, we can create a map
+	for (i=0 ; i<master.length ; i++) {
+		masterMap[master[i]] = i;
+	}
+
+	// And then cache what would be the indexOf fom the display
+	for (i=0 ; i<display.length ; i++) {
+		map[display[i]] = masterMap[display[i]];
+	}
+
+	display.sort(function(a, b){
+		// Short version of this function is simply `master.indexOf(a) - master.indexOf(b);`
+		return map[a] - map[b];
 	});
 }
 
@@ -5628,12 +5688,12 @@ function _fnSort ( oSettings, col, dir )
  *  @param {object} settings dataTables settings object
  *  @param {node} attachTo node to attach the handler to
  *  @param {int} colIdx column sorting index
- *  @param {boolean} [append=false] Append the requested sort to the existing
- *    sort if true (i.e. multi-column sort)
+ *  @param {int} addIndex Counter
+ *  @param {boolean} [shift=false] Shift click add
  *  @param {function} [callback] callback function
  *  @memberof DataTable#oApi
  */
-function _fnSortAdd ( settings, colIdx, append )
+function _fnSortAdd ( settings, colIdx, addIndex, shift )
 {
 	var col = settings.aoColumns[ colIdx ];
 	var sorting = settings.aaSorting;
@@ -5653,7 +5713,7 @@ function _fnSortAdd ( settings, colIdx, append )
 	};
 
 	if ( ! col.bSortable ) {
-		return;
+		return false;
 	}
 
 	// Convert to 2D array if needed
@@ -5662,7 +5722,7 @@ function _fnSortAdd ( settings, colIdx, append )
 	}
 
 	// If appending the sort then we are multi-column sorting
-	if ( append && settings.oFeatures.bSortMulti ) {
+	if ( (shift || addIndex) && settings.oFeatures.bSortMulti ) {
 		// Are we already doing some kind of sort on this column?
 		var sortIdx = _pluck(sorting, '0').indexOf(colIdx);
 
@@ -5682,11 +5742,18 @@ function _fnSortAdd ( settings, colIdx, append )
 				sorting[sortIdx]._idx = nextSortIdx;
 			}
 		}
-		else {
-			// No sort on this column yet
+		else if (shift) {
+			// No sort on this column yet, being added by shift click
+			// add it as itself
 			sorting.push( [ colIdx, asSorting[0], 0 ] );
 			sorting[sorting.length-1]._idx = 0;
 		}
+		else {
+			// No sort on this column yet, being added from a colspan
+			// so add with same direction as first column
+			sorting.push( [ colIdx, sorting[0][1], 0 ] );
+			sorting[sorting.length-1]._idx = 0;
+		}
 	}
 	else if ( sorting.length && sorting[0][0] == colIdx ) {
 		// Single column - already sorting on this column, modify the sort
@@ -7971,7 +8038,7 @@ var __details_events = function ( settings )
 			for ( var i=0, ien=data.length ; i<ien ; i++ ) {
 				row = data[i];
 
-				if ( row._details ) {
+				if ( row && row._details ) {
 					row._details.each(function () {
 						var el = $(this).children('td');
 
@@ -7990,7 +8057,7 @@ var __details_events = function ( settings )
 			}
 
 			for ( var i=0, ien=data.length ; i<ien ; i++ ) {
-				if ( data[i]._details ) {
+				if ( data[i] && data[i]._details ) {
 					__details_remove( api, i );
 				}
 			}
@@ -8012,9 +8079,9 @@ _api_register( _child_mth, function ( data, klass ) {
 
 	if ( data === undefined ) {
 		// get
-		return ctx.length && this.length ?
-			ctx[0].aoData[ this[0] ]._details :
-			undefined;
+		return ctx.length && this.length && ctx[0].aoData[ this[0] ]
+			? ctx[0].aoData[ this[0] ]._details
+			: undefined;
 	}
 	else if ( data === true ) {
 		// show
@@ -9337,6 +9404,8 @@ _api_register( 'destroy()', function ( remove ) {
 			jqTable.append( tfoot );
 		}
 
+		settings.colgroup.remove();
+
 		settings.aaSorting = [];
 		settings.aaSortingFixed = [];
 		_fnSortingClasses( settings );
@@ -9436,7 +9505,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.0.0";
+DataTable.version = "2.0.2";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -12181,7 +12250,7 @@ $.extend( true, DataTable.ext.renderer, {
 } );
 
 // Common function to remove new lines, strip HTML and diacritic control
-var _filterString = function (stripHtml, diacritics) {
+var _filterString = function (stripHtml, normalize) {
 	return function (str) {
 		if (_empty(str) || typeof str !== 'string') {
 			return str;
@@ -12193,8 +12262,8 @@ var _filterString = function (stripHtml, diacritics) {
 			str = _stripHtml(str);
 		}
 
-		if (diacritics) {
-			str = _normalize(str, true);
+		if (normalize) {
+			str = _normalize(str, false);
 		}
 
 		return str;
@@ -12572,7 +12641,7 @@ DataTable.type = function (name, prop, val) {
 	};
 
 	// prop is optional
-	if (! val) {
+	if (val === undefined) {
 		val = prop;
 		prop = null;
 	}
@@ -13231,7 +13300,7 @@ function _pagingDraw(settings, host, opts) {
 	if (
 		buttonEls.length && // any buttons
 		opts.numbers > 1 && // prevent infinite
-		$(host).outerHeight() >= ($(buttonEls[0]).outerHeight() * 2) - 10
+		$(host).height() >= ($(buttonEls[0]).outerHeight() * 2) - 10
 	) {
 		_pagingDraw(settings, host, $.extend({}, opts, { numbers: opts.numbers - 2 }));
 	}

package/package.json

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