b2b0ae8f214878fe08bc3f507624584cb6d3b242 fix: Fix issue with internal function not retrieving filter data where appropriate

Jira Issue DD-2209

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

Sync to source repo @e0ab0b8d5ced1203d28d8be126779d17c39af63f

Author: AllanJard

datatables.json

@@ -9,5 +9,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "1.11.2",
-    "last-sync": "b231df3c8fdf73ee04bcd2a6b75bb94e94322a74"
+    "last-sync": "e0ab0b8d5ced1203d28d8be126779d17c39af63f"
 }

js/jquery.dataTables.js

@@ -2796,9 +2796,18 @@
 			return cellData.call( rowData );
 		}
 
-		if ( cellData === null && type == 'display' ) {
+		if ( cellData === null && type === 'display' ) {
 			return '';
 		}
+	
+		if ( type === 'filter' ) {
+			var fomatters = DataTable.ext.type.search;
+	
+			if ( fomatters[ col.sType ] ) {
+				cellData = fomatters[ col.sType ]( cellData );
+			}
+		}
+	
 		return cellData;
 	}
 
@@ -4553,7 +4562,6 @@
 		var columns = settings.aoColumns;
 		var column;
 		var i, j, ien, jen, filterData, cellData, row;
-		var fomatters = DataTable.ext.type.search;
 		var wasInvalidated = false;
 
 		for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
@@ -4568,10 +4576,6 @@
 					if ( column.bSearchable ) {
 						cellData = _fnGetCellData( settings, i, j, 'filter' );
 
-						if ( fomatters[ column.sType ] ) {
-							cellData = fomatters[ column.sType ]( cellData );
-						}
-	
 						// Search in DataTables 1.10 is string based. In 1.11 this
 						// should be altered to also allow strict type checking.
 						if ( cellData === null ) {