Skip to content

Commit c748980

Browse files
committed
Revert "Issue #2725259 by sardara, andrewmacpherson, claudiu.cristea, tedbow, alwaysworking, droplet, techmsi, kwoxer, xjm, alexpott, @catch, @cilefen, @cottser, @lauriii: [regression] Table Drag handles no longer respond to up/down arrow keys"
This reverts commit 62e67b889396e715176721708e853d434d535b10.
1 parent 19f2e77 commit c748980

File tree

9 files changed

+10
-578
lines changed

9 files changed

+10
-578
lines changed

misc/tabledrag.es6.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -558,14 +558,10 @@
558558
case 38:
559559
// Safari up arrow.
560560
case 63232: {
561-
let $previousRow = $(self.rowObject.element)
562-
.prev('tr')
563-
.eq(0);
561+
let $previousRow = $(self.rowObject.element).prev('tr:first-of-type');
564562
let previousRow = $previousRow.get(0);
565563
while (previousRow && $previousRow.is(':hidden')) {
566-
$previousRow = $(previousRow)
567-
.prev('tr')
568-
.eq(0);
564+
$previousRow = $(previousRow).prev('tr:first-of-type');
569565
previousRow = $previousRow.get(0);
570566
}
571567
if (previousRow) {
@@ -581,9 +577,7 @@
581577
previousRow &&
582578
$previousRow.find('.js-indentation').length
583579
) {
584-
$previousRow = $(previousRow)
585-
.prev('tr')
586-
.eq(0);
580+
$previousRow = $(previousRow).prev('tr:first-of-type');
587581
previousRow = $previousRow.get(0);
588582
groupHeight += $previousRow.is(':hidden')
589583
? 0
@@ -624,13 +618,10 @@
624618
case 63233: {
625619
let $nextRow = $(self.rowObject.group)
626620
.eq(-1)
627-
.next('tr')
628-
.eq(0);
621+
.next('tr:first-of-type');
629622
let nextRow = $nextRow.get(0);
630623
while (nextRow && $nextRow.is(':hidden')) {
631-
$nextRow = $(nextRow)
632-
.next('tr')
633-
.eq(0);
624+
$nextRow = $(nextRow).next('tr:first-of-type');
634625
nextRow = $nextRow.get(0);
635626
}
636627
if (nextRow) {

misc/tabledrag.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
285285
case 38:
286286
case 63232:
287287
{
288-
var $previousRow = $(self.rowObject.element).prev('tr').eq(0);
288+
var $previousRow = $(self.rowObject.element).prev('tr:first-of-type');
289289
var previousRow = $previousRow.get(0);
290290
while (previousRow && $previousRow.is(':hidden')) {
291-
$previousRow = $(previousRow).prev('tr').eq(0);
291+
$previousRow = $(previousRow).prev('tr:first-of-type');
292292
previousRow = $previousRow.get(0);
293293
}
294294
if (previousRow) {
@@ -299,7 +299,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
299299
if ($(item).is('.tabledrag-root')) {
300300
groupHeight = 0;
301301
while (previousRow && $previousRow.find('.js-indentation').length) {
302-
$previousRow = $(previousRow).prev('tr').eq(0);
302+
$previousRow = $(previousRow).prev('tr:first-of-type');
303303
previousRow = $previousRow.get(0);
304304
groupHeight += $previousRow.is(':hidden') ? 0 : previousRow.offsetHeight;
305305
}
@@ -329,10 +329,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
329329
case 40:
330330
case 63233:
331331
{
332-
var $nextRow = $(self.rowObject.group).eq(-1).next('tr').eq(0);
332+
var $nextRow = $(self.rowObject.group).eq(-1).next('tr:first-of-type');
333333
var nextRow = $nextRow.get(0);
334334
while (nextRow && $nextRow.is(':hidden')) {
335-
$nextRow = $(nextRow).next('tr').eq(0);
335+
$nextRow = $(nextRow).next('tr:first-of-type');
336336
nextRow = $nextRow.get(0);
337337
}
338338
if (nextRow) {

modules/system/tests/modules/tabledrag_test/js/tabledrag_test.es6.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

modules/system/tests/modules/tabledrag_test/js/tabledrag_test.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

modules/system/tests/modules/tabledrag_test/src/Form/TableDragTestForm.php

Lines changed: 0 additions & 157 deletions
This file was deleted.

modules/system/tests/modules/tabledrag_test/tabledrag_test.info.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

modules/system/tests/modules/tabledrag_test/tabledrag_test.libraries.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

modules/system/tests/modules/tabledrag_test/tabledrag_test.routing.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)