adab8a9ed0fcf8b77345ebc0ce76062bd350a358 Fix: Correct error when usin…

…g scrolling and RowGroup - column sizing was incorrect

The "fixing" of sizes was reading the grouping row, which was incorrect

Sync to source repo @adab8a9ed0fcf8b77345ebc0ce76062bd350a358

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.1.4",
-    "last-sync": "08b0f7110addabcfd814a9215a18ced31e54a8f5"
+    "last-sync": "adab8a9ed0fcf8b77345ebc0ce76062bd350a358"
 }

js/dataTables.js

@@ -5226,21 +5226,35 @@
 		// is because of Responsive which might remove `col` elements, knocking the alignment
 		// of the indexes out.
 		if (settings.aiDisplay.length) {
-			// Get the column sizes from the first row in the table
-			var colSizes = table.children('tbody').eq(0).children('tr').eq(0).children('th, td').map(function (vis) {
-				return {
-					idx: _fnVisibleToColumnIndex(settings, vis),
-					width: $(this).outerWidth()
+			// Get the column sizes from the first row in the table. This should really be a
+			// [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year
+			// browser support
+			var firstTr = null;
+
+			for (i=0 ; i<settings.aiDisplay.length ; i++) {
+				var idx = settings.aiDisplay[i];
+
+				if (settings.aoData[idx].nTr) {
+					firstTr = settings.aoData[idx].nTr;
 				}
-			});
+			}
 
-			// Check against what the colgroup > col is set to and correct if needed
-			for (var i=0 ; i<colSizes.length ; i++) {
-				var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
-				var colWidth = colEl.style.width.replace('px', '');
+			if (firstTr) {
+				var colSizes = $(firstTr).children('th, td').map(function (vis) {
+					return {
+						idx: _fnVisibleToColumnIndex(settings, vis),
+						width: $(this).outerWidth()
+					}
+				});
 
-				if (colWidth !== colSizes[i].width) {
-					colEl.style.width = colSizes[i].width + 'px';
+				// Check against what the colgroup > col is set to and correct if needed
+				for (var i=0 ; i<colSizes.length ; i++) {
+					var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
+					var colWidth = colEl.style.width.replace('px', '');
+
+					if (colWidth !== colSizes[i].width) {
+						colEl.style.width = colSizes[i].width + 'px';
+					}
 				}
 			}
 		}

js/dataTables.mjs

@@ -5173,21 +5173,35 @@ function _fnScrollDraw ( settings )
 	// is because of Responsive which might remove `col` elements, knocking the alignment
 	// of the indexes out.
 	if (settings.aiDisplay.length) {
-		// Get the column sizes from the first row in the table
-		var colSizes = table.children('tbody').eq(0).children('tr').eq(0).children('th, td').map(function (vis) {
-			return {
-				idx: _fnVisibleToColumnIndex(settings, vis),
-				width: $(this).outerWidth()
+		// Get the column sizes from the first row in the table. This should really be a
+		// [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year
+		// browser support
+		var firstTr = null;
+
+		for (i=0 ; i<settings.aiDisplay.length ; i++) {
+			var idx = settings.aiDisplay[i];
+
+			if (settings.aoData[idx].nTr) {
+				firstTr = settings.aoData[idx].nTr;
 			}
-		});
+		}
 
-		// Check against what the colgroup > col is set to and correct if needed
-		for (var i=0 ; i<colSizes.length ; i++) {
-			var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
-			var colWidth = colEl.style.width.replace('px', '');
+		if (firstTr) {
+			var colSizes = $(firstTr).children('th, td').map(function (vis) {
+				return {
+					idx: _fnVisibleToColumnIndex(settings, vis),
+					width: $(this).outerWidth()
+				}
+			});
 
-			if (colWidth !== colSizes[i].width) {
-				colEl.style.width = colSizes[i].width + 'px';
+			// Check against what the colgroup > col is set to and correct if needed
+			for (var i=0 ; i<colSizes.length ; i++) {
+				var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
+				var colWidth = colEl.style.width.replace('px', '');
+
+				if (colWidth !== colSizes[i].width) {
+					colEl.style.width = colSizes[i].width + 'px';
+				}
 			}
 		}
 	}