@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Prevent keyboard selection of change blocks inside edit suggestions
Summary: Ref T13513. When a revision has inlines with edit suggestions, pressing "j" and "k" can incorrectly select the blocks inside the diffs inside the inlines.
Test Plan: Used "j" to cycle through changes in a revision with inline comments with edit suggestions, didn't get jumped into the suggestion diffs.
Maniphest Tasks: T13513
Differential Revision: https://secure.phabricator.com/D21283
+19
-4
+4
-4
resources/celerity/map.php
+4
-4
resources/celerity/map.php
···
13
13
'core.pkg.js' => '845355f4',
14
14
'dark-console.pkg.js' => '187792c2',
15
15
'differential.pkg.css' => '5c459f92',
16
-
'differential.pkg.js' => 'a7171fb6',
16
+
'differential.pkg.js' => '2b4a7014',
17
17
'diffusion.pkg.css' => '42c75c37',
18
18
'diffusion.pkg.js' => 'a98c0bf7',
19
19
'maniphest.pkg.css' => '35995d6d',
···
379
379
'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => 'a2ab19be',
380
380
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
381
381
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
382
-
'rsrc/js/application/diff/DiffChangeset.js' => '3a1ca35b',
382
+
'rsrc/js/application/diff/DiffChangeset.js' => '39dcf2c3',
383
383
'rsrc/js/application/diff/DiffChangesetList.js' => 'cc2c5de5',
384
384
'rsrc/js/application/diff/DiffInline.js' => '008b6a15',
385
385
'rsrc/js/application/diff/DiffPathView.js' => '8207abf9',
···
776
776
'phabricator-darklog' => '3b869402',
777
777
'phabricator-darkmessage' => '26cd4b73',
778
778
'phabricator-dashboard-css' => '5a205b9d',
779
-
'phabricator-diff-changeset' => '3a1ca35b',
779
+
'phabricator-diff-changeset' => '39dcf2c3',
780
780
'phabricator-diff-changeset-list' => 'cc2c5de5',
781
781
'phabricator-diff-inline' => '008b6a15',
782
782
'phabricator-diff-path-view' => '8207abf9',
···
1231
1231
'trigger-rule',
1232
1232
'trigger-rule-type',
1233
1233
),
1234
-
'3a1ca35b' => array(
1234
+
'39dcf2c3' => array(
1235
1235
'javelin-dom',
1236
1236
'javelin-util',
1237
1237
'javelin-stratcom',
+15
webroot/rsrc/js/application/diff/DiffChangeset.js
+15
webroot/rsrc/js/application/diff/DiffChangeset.js
···
454
454
var blocks = [];
455
455
var block;
456
456
var ii;
457
+
var parent_node = null;
457
458
for (ii = 0; ii < rows.length; ii++) {
458
459
var type = this._getRowType(rows[ii]);
460
+
461
+
// This row might be part of a diff inside an inline comment, showing
462
+
// an inline edit suggestion. Before we accept it as a possible target
463
+
// for selection, make sure it's a child of the right parent.
464
+
465
+
if (parent_node === null) {
466
+
parent_node = rows[ii].parentNode;
467
+
}
468
+
469
+
if (type !== null) {
470
+
if (rows[ii].parentNode !== parent_node) {
471
+
type = null;
472
+
}
473
+
}
459
474
460
475
if (!block || (block.type !== type)) {
461
476
block = {