@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
Highlight cell when jumping to an inline comment
Summary: Fixes T8061.
Test Plan: {F392321}
Reviewers: chad
Reviewed By: chad
Subscribers: epriestley
Maniphest Tasks: T8061
Differential Revision: https://secure.phabricator.com/D12705
+31
-14
+5
-5
resources/celerity/map.php
+5
-5
resources/celerity/map.php
···
10
10
'core.pkg.css' => 'ca3f6a60',
11
11
'core.pkg.js' => '3331b919',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
-
'differential.pkg.css' => '13312972',
13
+
'differential.pkg.css' => 'bb338e4b',
14
14
'differential.pkg.js' => '3cfa26f9',
15
15
'diffusion.pkg.css' => '591664fa',
16
16
'diffusion.pkg.js' => '0115b37c',
···
58
58
'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
59
59
'rsrc/css/application/differential/changeset-view.css' => 'e19cfd6e',
60
60
'rsrc/css/application/differential/core.css' => '7ac3cabc',
61
-
'rsrc/css/application/differential/phui-inline-comment.css' => 'df8fbd63',
61
+
'rsrc/css/application/differential/phui-inline-comment.css' => '2174771a',
62
62
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
63
-
'rsrc/css/application/differential/revision-comment.css' => '024dda6b',
63
+
'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
64
64
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
65
65
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
66
66
'rsrc/css/application/differential/table-of-contents.css' => '63f3ef4a',
···
530
530
'differential-inline-comment-editor' => '2529c82d',
531
531
'differential-results-table-css' => '181aa9d9',
532
532
'differential-revision-add-comment-css' => 'c47f8c40',
533
-
'differential-revision-comment-css' => '024dda6b',
533
+
'differential-revision-comment-css' => '14b8565a',
534
534
'differential-revision-history-css' => '0e8eb855',
535
535
'differential-revision-list-css' => 'f3c47d33',
536
536
'differential-table-of-contents-css' => '63f3ef4a',
···
795
795
'phui-image-mask-css' => '5a8b09c8',
796
796
'phui-info-panel-css' => '27ea50a1',
797
797
'phui-info-view-css' => 'c6f0aef8',
798
-
'phui-inline-comment-view-css' => 'df8fbd63',
798
+
'phui-inline-comment-view-css' => '2174771a',
799
799
'phui-list-view-css' => '2e25ebfb',
800
800
'phui-object-box-css' => '7d160002',
801
801
'phui-object-item-list-view-css' => '9db65899',
+17
-2
src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+17
-2
src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
···
71
71
return $this->objectOwnerPHID;
72
72
}
73
73
74
-
public function render() {
74
+
public function getAnchorName() {
75
+
$inline = $this->inlineComment;
76
+
if ($inline->getID()) {
77
+
return 'inline-'.$inline->getID();
78
+
}
79
+
return null;
80
+
}
81
+
82
+
public function getScaffoldCellID() {
83
+
$anchor = $this->getAnchorName();
84
+
if ($anchor) {
85
+
return 'anchor-'.$anchor;
86
+
}
87
+
return null;
88
+
}
75
89
90
+
public function render() {
76
91
require_celerity_resource('phui-inline-comment-view-css');
77
92
$inline = $this->inlineComment;
78
93
···
218
233
}
219
234
}
220
235
221
-
$anchor_name = 'inline-'.$inline->getID();
236
+
$anchor_name = $this->getAnchorName();
222
237
223
238
if ($this->editable && !$this->preview) {
224
239
$edit_button = id(new PHUIButtonView())
+4
src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
+4
src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
+1
src/infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php
+1
src/infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php
+2
src/infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php
+2
src/infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php
···
52
52
53
53
$left_attrs = array(
54
54
'class' => 'left',
55
+
'id' => ($left_side ? $left_side->getScaffoldCellID() : null),
55
56
);
56
57
57
58
$right_attrs = array(
58
59
'colspan' => 3,
59
60
'class' => 'right3',
61
+
'id' => ($right_side ? $right_side->getScaffoldCellID() : null),
60
62
);
61
63
62
64
$cells = array(
+2
-3
webroot/rsrc/css/application/differential/phui-inline-comment.css
+2
-3
webroot/rsrc/css/application/differential/phui-inline-comment.css
···
2
2
* @provides phui-inline-comment-view-css
3
3
*/
4
4
5
-
.differential-comment-list .anchor-target {
6
-
background-color: #ffffdd;
7
-
border-color: #ffff00;
5
+
.differential-diff td.anchor-target {
6
+
background: {$lightyellow};
8
7
}
9
8
10
9
/* In the document, the anchor is positioned inside the inline comment, but