f05e12c99d817fded09331e73fcc2e016baea675 Fix: When there is no data in the table, type detection for checkbox columns would fail (requires DataTables 2.1).

Note: Related to this, before DataTables 2.1 if searching and ordering on a DataTable were disabled, type detection would fail. DT2.1 address that.

DD-2968

Sync to source repo @f05e12c99d817fded09331e73fcc2e016baea675

Author: dtbuild

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/Select",
     "last-tag": "2.0.3",
-    "last-sync": "29499007cfe39c2eff6a7fa268d043358b45e41d"
+    "last-sync": "f05e12c99d817fded09331e73fcc2e016baea675"
 }

js/dataTables.select.js

@@ -1514,12 +1514,26 @@ $.each(['Row', 'Column', 'Cell'], function (i, item) {
 	};
 });
 
+// Note that DataTables 2.1 has more robust type detection, but we retain
+// backwards compatbility with 2.0 for the moment.
 DataTable.type('select-checkbox', {
 	className: 'dt-select',
-	detect: function (data) {
-		// Rendering function will tell us if it is a checkbox type
-		return data === 'select-checkbox' ? data : false;
-	},
+	detect: DataTable.versionCheck('2.1')
+		? {
+			oneOf: function () {
+				return false; // no op
+			},
+			allOf: function () {
+				return false; // no op
+			},
+			init: function (settings, col, idx) {
+				return col.mRender && col.mRender.name === 'selectCheckbox';
+			}
+		}
+		: function (data) {
+			// Rendering function will tell us if it is a checkbox type
+			return data === 'select-checkbox' ? data : false;
+		},
 	order: {
 		pre: function (d) {
 			return d === 'X' ? -1 : 0;
@@ -1539,7 +1553,7 @@ DataTable.render.select = function (valueProp, nameProp) {
 	var valueFn = valueProp ? DataTable.util.get(valueProp) : null;
 	var nameFn = nameProp ? DataTable.util.get(nameProp) : null;
 
-	return function (data, type, row, meta) {
+	return function selectCheckbox(data, type, row, meta) {
 		var dtRow = meta.settings.aoData[meta.row];
 		var selected = dtRow._select_selected;
 		var ariaLabel = meta.settings.oLanguage.select.aria.rowCheckbox;

js/dataTables.select.min.js

@@ -1474,12 +1474,26 @@ $.each(['Row', 'Column', 'Cell'], function (i, item) {
 	};
 });
 
+// Note that DataTables 2.1 has more robust type detection, but we retain
+// backwards compatbility with 2.0 for the moment.
 DataTable.type('select-checkbox', {
 	className: 'dt-select',
-	detect: function (data) {
-		// Rendering function will tell us if it is a checkbox type
-		return data === 'select-checkbox' ? data : false;
-	},
+	detect: DataTable.versionCheck('2.1')
+		? {
+			oneOf: function () {
+				return false; // no op
+			},
+			allOf: function () {
+				return false; // no op
+			},
+			init: function (settings, col, idx) {
+				return col.mRender && col.mRender.name === 'selectCheckbox';
+			}
+		}
+		: function (data) {
+			// Rendering function will tell us if it is a checkbox type
+			return data === 'select-checkbox' ? data : false;
+		},
 	order: {
 		pre: function (d) {
 			return d === 'X' ? -1 : 0;
@@ -1499,7 +1513,7 @@ DataTable.render.select = function (valueProp, nameProp) {
 	var valueFn = valueProp ? DataTable.util.get(valueProp) : null;
 	var nameFn = nameProp ? DataTable.util.get(nameProp) : null;
 
-	return function (data, type, row, meta) {
+	return function selectCheckbox(data, type, row, meta) {
 		var dtRow = meta.settings.aoData[meta.row];
 		var selected = dtRow._select_selected;
 		var ariaLabel = meta.settings.oLanguage.select.aria.rowCheckbox;