51d9b85d178d40f373e7985ca538125cb19a95e4 Dev fix: Better fix - the pr…

…evious one didn't allow row level class/id for start/end only rows

Sync to source repo @51d9b85d178d40f373e7985ca538125cb19a95e4

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.0.8",
-    "last-sync": "03b1f67af4971638c9d1e5d1871307cce8d669e7"
+    "last-sync": "51d9b85d178d40f373e7985ca538125cb19a95e4"
 }

js/dataTables.js

@@ -3688,37 +3688,27 @@
 
 		// Split into rows
 		var rows = [];
-		for ( var i=0, ien=filtered.length ; i<ien ; i++ ) {
+
+		for (var i=0, ien=filtered.length; i<ien; i++) {
 			var val = filtered[i].val;
 
-			if (val.full) {
+			if ( val.full ) {
 				rows.push({
 					className: val.className,
 					id: val.id,
 					full: val.full
 				});
-			}
 
-			if (val.start && val.end) {
-				rows.push({
-					start: val.start,
-					end: val.end
-				});
-			}
-			else if (val.start) {
-				rows.push({
-					start: val.start
-				});
+				delete val.full;
 			}
-			else if (val.end) {
-				rows.push({
-					end: val.end
-				});
+
+			if (val.start || val.end) {
+				rows.push(val);
 			}
 		}
 
-		for (var row=0 ; row<rows.length ; row++) {
-			_layoutResolve( settings, rows[row] );
+		for (var row = 0; row<rows.length; row++) {
+			_layoutResolve(settings, rows[row]);
 		}
 
 		return rows;

js/dataTables.mjs

@@ -3635,37 +3635,27 @@ function _layoutArray ( settings, layout, side )
 
 	// Split into rows
 	var rows = [];
-	for ( var i=0, ien=filtered.length ; i<ien ; i++ ) {
+
+	for (var i=0, ien=filtered.length; i<ien; i++) {
 		var val = filtered[i].val;
 
-		if (val.full) {
+		if ( val.full ) {
 			rows.push({
 				className: val.className,
 				id: val.id,
 				full: val.full
 			});
-		}
 
-		if (val.start && val.end) {
-			rows.push({
-				start: val.start,
-				end: val.end
-			});
-		}
-		else if (val.start) {
-			rows.push({
-				start: val.start
-			});
+			delete val.full;
 		}
-		else if (val.end) {
-			rows.push({
-				end: val.end
-			});
+
+		if (val.start || val.end) {
+			rows.push(val);
 		}
 	}
 
-	for (var row=0 ; row<rows.length ; row++) {
-		_layoutResolve( settings, rows[row] );
+	for (var row = 0; row<rows.length; row++) {
+		_layoutResolve(settings, rows[row]);
 	}
 
 	return rows;