62de69f5139683e67d10cd30b43cc4a860bf2bb8 Updated: The :visible colu…

…mn selector can now have a DOM selector in front of it to select visible columns based on the selector given.

Sync to source repo @62de69f5139683e67d10cd30b43cc4a860bf2bb8

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.1.3",
-    "last-sync": "dd8627378442bf4a2d6f6c33328bb04dc4b90607"
+    "last-sync": "62de69f5139683e67d10cd30b43cc4a860bf2bb8"
 }

js/dataTables.js

@@ -8482,8 +8482,10 @@
 				switch( match[2] ) {
 					case 'visIdx':
 					case 'visible':
-						if (match[1]) {
+						// Selector is a column index
+						if (match[1] && match[1].match(/^\d+$/)) {
 							var idx = parseInt( match[1], 10 );
+
 							// Visible index given, convert to column index
 							if ( idx < 0 ) {
 								// Counting from the right
@@ -8496,9 +8498,19 @@
 							return [ _fnVisibleToColumnIndex( settings, idx ) ];
 						}
 
-						// `:visible` on its own
-						return columns.map( function (col, i) {
-							return col.bVisible ? i : null;
+						return columns.map( function (col, idx) {
+							// Not visible, can't match
+							if (! col.bVisible) {
+								return null;
+							}
+
+							// Selector
+							if (match[1]) {
+								return $(nodes[idx]).filter(match[1]).length > 0 ? idx : null;
+							}
+
+							// `:visible` on its own
+							return idx;
 						} );
 
 					case 'name':

js/dataTables.mjs

@@ -8429,8 +8429,10 @@ var __column_selector = function ( settings, selector, opts )
 			switch( match[2] ) {
 				case 'visIdx':
 				case 'visible':
-					if (match[1]) {
+					// Selector is a column index
+					if (match[1] && match[1].match(/^\d+$/)) {
 						var idx = parseInt( match[1], 10 );
+
 						// Visible index given, convert to column index
 						if ( idx < 0 ) {
 							// Counting from the right
@@ -8443,9 +8445,19 @@ var __column_selector = function ( settings, selector, opts )
 						return [ _fnVisibleToColumnIndex( settings, idx ) ];
 					}
 
-					// `:visible` on its own
-					return columns.map( function (col, i) {
-						return col.bVisible ? i : null;
+					return columns.map( function (col, idx) {
+						// Not visible, can't match
+						if (! col.bVisible) {
+							return null;
+						}
+
+						// Selector
+						if (match[1]) {
+							return $(nodes[idx]).filter(match[1]).length > 0 ? idx : null;
+						}
+
+						// `:visible` on its own
+						return idx;
 					} );
 
 				case 'name':