datatables.net 2.0.1 → 2.0.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.0.1
+/*! 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);
 		}
 	});
@@ -2389,17 +2389,19 @@ function _fnApplyColumnDefs( oSettings, aoColDefs, aoCols, headerLayout, fn )
 						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 (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 );
+									}
 								}
 							});
 						}
@@ -3213,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()
 				};
 			}
 		}
@@ -4002,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
@@ -5004,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">');
 		});
 	}
 
@@ -5364,34 +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++ ) {
-					_fnSortAdd( settings, columns[i], i, e.shiftKey );
+				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;
-					}
+				// 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);
+			}
 		}
 	} );
 }
@@ -5695,7 +5713,7 @@ function _fnSortAdd ( settings, colIdx, addIndex, shift )
 	};
 
 	if ( ! col.bSortable ) {
-		return;
+		return false;
 	}
 
 	// Convert to 2D array if needed
@@ -8020,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');
 
@@ -8039,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 );
 				}
 			}
@@ -8061,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
@@ -9487,7 +9505,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.0.1";
+DataTable.version = "2.0.2";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -12623,7 +12641,7 @@ DataTable.type = function (name, prop, val) {
 	};
 
 	// prop is optional
-	if (! val) {
+	if (val === undefined) {
 		val = prop;
 		prop = null;
 	}
@@ -13282,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.1",
+    "version": "2.0.2",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",