ec69cb56b909e9f6807d35b846cc8b3dd69c5efd Fix: Don't append span.dt-column-order to header rows / cells with data-dt-order=disable.

a643c14888287e8ecbbebe64e55fa05f142320db Build: Update to latest BS5 and Bulma

355a8d9e135df81b7cfecc53e2c25009603fd032 Merge branch 'master' of github.com:DataTables/DataTablesSrc

Sync to source repo @355a8d9e135df81b7cfecc53e2c25009603fd032

Author: dtbuild

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.2.2",
-    "last-sync": "312094f9065d6755f52ca20bc1a2b540d274116e"
+    "last-sync": "355a8d9e135df81b7cfecc53e2c25009603fd032"
 }

js/dataTables.js

@@ -3986,6 +3986,7 @@
 					cell.nodeName.toUpperCase() == 'TH'
 				) {
 					var cols = [];
+					var jqCell = $(cell);
 
 					// Get the col and rowspan attributes from the DOM and sanitise them
 					colspan = cell.getAttribute('colspan') * 1;
@@ -4006,7 +4007,7 @@
 					if ( write ) {
 						if (unique) {
 							// Allow column options to be set from HTML attributes
-							_fnColumnOptions( settings, shifted, $(cell).data() );
+							_fnColumnOptions( settings, shifted, jqCell.data() );
 
 							// Get the width for the column. This can be defined from the
 							// width attribute, style attribute or `columns.width` option
@@ -4048,12 +4049,12 @@
 							// Fall back to the aria-label attribute on the table header if no ariaTitle is
 							// provided.
 							if (! columnDef.ariaTitle) {
-								columnDef.ariaTitle = $(cell).attr("aria-label") || columnDef.sTitle;
+								columnDef.ariaTitle = jqCell.attr("aria-label") || columnDef.sTitle;
 							}
 
 							// Column specific class names
 							if ( columnDef.className ) {
-								$(cell).addClass( columnDef.className );
+								jqCell.addClass( columnDef.className );
 							}
 						}
 
@@ -4068,6 +4069,8 @@
 						if (
 							settings.orderIndicators &&
 							isHeader &&
+							jqCell.filter(':not([data-dt-order=disable])').length !== 0 &&
+							jqCell.parent(':not([data-dt-order=disable])').length !== 0 &&
 							$('span.dt-column-order', cell).length === 0
 						) {
 							$('<span>')

js/dataTables.min.js

@@ -3951,6 +3951,7 @@ function _fnDetectHeader ( settings, thead, write )
 				cell.nodeName.toUpperCase() == 'TH'
 			) {
 				var cols = [];
+				var jqCell = $(cell);
 
 				// Get the col and rowspan attributes from the DOM and sanitise them
 				colspan = cell.getAttribute('colspan') * 1;
@@ -3971,7 +3972,7 @@ function _fnDetectHeader ( settings, thead, write )
 				if ( write ) {
 					if (unique) {
 						// Allow column options to be set from HTML attributes
-						_fnColumnOptions( settings, shifted, $(cell).data() );
+						_fnColumnOptions( settings, shifted, jqCell.data() );
 
 						// Get the width for the column. This can be defined from the
 						// width attribute, style attribute or `columns.width` option
@@ -4013,12 +4014,12 @@ function _fnDetectHeader ( settings, thead, write )
 						// Fall back to the aria-label attribute on the table header if no ariaTitle is
 						// provided.
 						if (! columnDef.ariaTitle) {
-							columnDef.ariaTitle = $(cell).attr("aria-label") || columnDef.sTitle;
+							columnDef.ariaTitle = jqCell.attr("aria-label") || columnDef.sTitle;
 						}
 
 						// Column specific class names
 						if ( columnDef.className ) {
-							$(cell).addClass( columnDef.className );
+							jqCell.addClass( columnDef.className );
 						}
 					}
 
@@ -4033,6 +4034,8 @@ function _fnDetectHeader ( settings, thead, write )
 					if (
 						settings.orderIndicators &&
 						isHeader &&
+						jqCell.filter(':not([data-dt-order=disable])').length !== 0 &&
+						jqCell.parent(':not([data-dt-order=disable])').length !== 0 &&
 						$('span.dt-column-order', cell).length === 0
 					) {
 						$('<span>')