079d776d2c7eaf9f0131b195d41da7afccc8e3dd Fix: tabindex for keyboard…

… accessability wasn't being applied correctly

Fix: `tabindex` could incorrectly be applied to the final column when Ajax loading data

DataTables/Responsive#135

Sync to source repo @079d776d2c7eaf9f0131b195d41da7afccc8e3dd

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/Responsive",
     "last-tag": "3.0.3",
-    "last-sync": "f0d38e6f1e3405f2e626eec16263186c79855aa3"
+    "last-sync": "079d776d2c7eaf9f0131b195d41da7afccc8e3dd"
 }

js/dataTables.responsive.js

@@ -743,11 +743,15 @@ $.extend(Responsive.prototype, {
 				.filter('.dtr-control')
 				.removeClass('dtr-control');
 
-			dt.cells(null, firstVisible, { page: 'current' })
-				.nodes()
-				.to$()
-				.addClass('dtr-control');
+			if (firstVisible >= 0) {
+				dt.cells(null, firstVisible, { page: 'current' })
+					.nodes()
+					.to$()
+					.addClass('dtr-control');
+			}
 		}
+
+		this._tabIndexes();
 	},
 
 	/**
@@ -814,12 +818,6 @@ $.extend(Responsive.prototype, {
 			details.target = 'td.dtr-control, th.dtr-control';
 		}
 
-		// Keyboard accessibility
-		dt.on('draw.dtr', function () {
-			that._tabIndexes();
-		});
-		that._tabIndexes(); // Initial draw has already happened
-
 		$(dt.table().body()).on('keyup.dtr', 'td, th', function (e) {
 			if (e.keyCode === 13 && $(this).data('dtr-keyboard')) {
 				$(this).click();
@@ -1370,7 +1368,12 @@ $.extend(Responsive.prototype, {
 				target = '>td:first-child, >th:first-child';
 			}
 
-			$(target, dt.rows({ page: 'current' }).nodes())
+			var rows = dt.rows({ page: 'current' }).nodes();
+			var nodes = target === 'tr'
+				? $(rows)
+				: $(target, rows);
+
+			nodes
 				.attr('tabIndex', ctx.iTabIndex)
 				.data('dtr-keyboard', 1);
 		}

js/dataTables.responsive.mjs

@@ -703,11 +703,15 @@ $.extend(Responsive.prototype, {
 				.filter('.dtr-control')
 				.removeClass('dtr-control');
 
-			dt.cells(null, firstVisible, { page: 'current' })
-				.nodes()
-				.to$()
-				.addClass('dtr-control');
+			if (firstVisible >= 0) {
+				dt.cells(null, firstVisible, { page: 'current' })
+					.nodes()
+					.to$()
+					.addClass('dtr-control');
+			}
 		}
+
+		this._tabIndexes();
 	},
 
 	/**
@@ -774,12 +778,6 @@ $.extend(Responsive.prototype, {
 			details.target = 'td.dtr-control, th.dtr-control';
 		}
 
-		// Keyboard accessibility
-		dt.on('draw.dtr', function () {
-			that._tabIndexes();
-		});
-		that._tabIndexes(); // Initial draw has already happened
-
 		$(dt.table().body()).on('keyup.dtr', 'td, th', function (e) {
 			if (e.keyCode === 13 && $(this).data('dtr-keyboard')) {
 				$(this).click();
@@ -1330,7 +1328,12 @@ $.extend(Responsive.prototype, {
 				target = '>td:first-child, >th:first-child';
 			}
 
-			$(target, dt.rows({ page: 'current' }).nodes())
+			var rows = dt.rows({ page: 'current' }).nodes();
+			var nodes = target === 'tr'
+				? $(rows)
+				: $(target, rows);
+
+			nodes
 				.attr('tabIndex', ctx.iTabIndex)
 				.data('dtr-keyboard', 1);
 		}