@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
Move "List Inline Comments" to the inline header dropdown menu
Summary: See D18128. Ref T12733. Ref T8250.
Test Plan: {F5003153}
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12733, T8250
Differential Revision: https://secure.phabricator.com/D18129
+72
-33
+25
-25
resources/celerity/map.php
+25
-25
resources/celerity/map.php
···
10
10
'conpherence.pkg.css' => 'ff161f2d',
11
11
'conpherence.pkg.js' => 'b5b51108',
12
12
'core.pkg.css' => 'ab24402f',
13
-
'core.pkg.js' => '1475bd91',
13
+
'core.pkg.js' => '5d80e0db',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '4ec4a37a',
16
-
'differential.pkg.js' => 'a55a2c13',
16
+
'differential.pkg.js' => 'd4ab0e81',
17
17
'diffusion.pkg.css' => 'b93d9b8c',
18
18
'diffusion.pkg.js' => '6134c5a1',
19
19
'favicon.ico' => '30672e08',
···
396
396
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
397
397
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
398
398
'rsrc/js/application/diff/DiffChangeset.js' => '99abf4cd',
399
-
'rsrc/js/application/diff/DiffChangesetList.js' => 'd442be4a',
399
+
'rsrc/js/application/diff/DiffChangesetList.js' => '79de07c6',
400
400
'rsrc/js/application/diff/DiffInline.js' => '1bfa31c7',
401
401
'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
402
402
'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
403
403
'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
404
-
'rsrc/js/application/differential/behavior-populate.js' => '5e41c819',
404
+
'rsrc/js/application/differential/behavior-populate.js' => '419998ab',
405
405
'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
406
406
'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
407
407
'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
···
526
526
'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b',
527
527
'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
528
528
'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
529
-
'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b',
529
+
'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
530
530
'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267',
531
531
'rsrc/js/phuix/PHUIXButtonView.js' => 'a37126bd',
532
532
'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50',
···
616
616
'javelin-behavior-diff-preview-link' => '051c7832',
617
617
'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
618
618
'javelin-behavior-differential-feedback-preview' => '51c5ad07',
619
-
'javelin-behavior-differential-populate' => '5e41c819',
619
+
'javelin-behavior-differential-populate' => '419998ab',
620
620
'javelin-behavior-differential-user-select' => 'a8d8459d',
621
621
'javelin-behavior-diffusion-browse-file' => '054a0f0b',
622
622
'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
···
775
775
'phabricator-darkmessage' => 'c48cccdd',
776
776
'phabricator-dashboard-css' => 'fe5b1869',
777
777
'phabricator-diff-changeset' => '99abf4cd',
778
-
'phabricator-diff-changeset-list' => 'd442be4a',
778
+
'phabricator-diff-changeset-list' => '79de07c6',
779
779
'phabricator-diff-inline' => '1bfa31c7',
780
780
'phabricator-drag-and-drop-file-upload' => '58dea2fa',
781
781
'phabricator-draggable-list' => 'bea6e7f4',
···
878
878
'phui-workcard-view-css' => 'cca5fa92',
879
879
'phui-workpanel-view-css' => 'a3a63478',
880
880
'phuix-action-list-view' => 'b5c256b8',
881
-
'phuix-action-view' => 'b3465b9b',
881
+
'phuix-action-view' => '442efd08',
882
882
'phuix-autocomplete' => 'f6699267',
883
883
'phuix-button-view' => 'a37126bd',
884
884
'phuix-dropdown-menu' => '8018ee50',
···
1160
1160
'javelin-workflow',
1161
1161
'phabricator-draggable-list',
1162
1162
),
1163
+
'419998ab' => array(
1164
+
'javelin-behavior',
1165
+
'javelin-dom',
1166
+
'javelin-stratcom',
1167
+
'phabricator-tooltip',
1168
+
'phabricator-diff-changeset-list',
1169
+
'phabricator-diff-changeset',
1170
+
),
1163
1171
42126667 => array(
1164
1172
'javelin-behavior',
1165
1173
'javelin-dom',
···
1174
1182
'javelin-workflow',
1175
1183
'javelin-workboard-controller',
1176
1184
),
1185
+
'442efd08' => array(
1186
+
'javelin-install',
1187
+
'javelin-dom',
1188
+
'javelin-util',
1189
+
),
1177
1190
'44959b73' => array(
1178
1191
'javelin-util',
1179
1192
'javelin-uri',
···
1335
1348
'phabricator-phtize',
1336
1349
'javelin-dom',
1337
1350
),
1338
-
'5e41c819' => array(
1339
-
'javelin-behavior',
1340
-
'javelin-dom',
1341
-
'javelin-stratcom',
1342
-
'phabricator-tooltip',
1343
-
'phabricator-diff-changeset-list',
1344
-
'phabricator-diff-changeset',
1345
-
),
1346
1351
'5e9f347c' => array(
1347
1352
'javelin-behavior',
1348
1353
'multirow-row-manager',
···
1471
1476
'javelin-behavior',
1472
1477
'javelin-quicksand',
1473
1478
),
1479
+
'79de07c6' => array(
1480
+
'javelin-install',
1481
+
'phuix-button-view',
1482
+
),
1474
1483
'7a68dda3' => array(
1475
1484
'owners-path-editor',
1476
1485
'javelin-behavior',
···
1778
1787
'javelin-uri',
1779
1788
'javelin-request',
1780
1789
),
1781
-
'b3465b9b' => array(
1782
-
'javelin-install',
1783
-
'javelin-dom',
1784
-
'javelin-util',
1785
-
),
1786
1790
'b3a4b884' => array(
1787
1791
'javelin-behavior',
1788
1792
'phabricator-prefab',
···
1986
1990
),
1987
1991
'd254d646' => array(
1988
1992
'javelin-util',
1989
-
),
1990
-
'd442be4a' => array(
1991
-
'javelin-install',
1992
-
'phuix-button-view',
1993
1993
),
1994
1994
'd4505101' => array(
1995
1995
'javelin-stratcom',
+6
-6
src/applications/differential/controller/DifferentialRevisionViewController.php
+6
-6
src/applications/differential/controller/DifferentialRevisionViewController.php
···
281
281
->setTitle(pht('Diff %s', $target->getID()))
282
282
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
283
283
284
+
285
+
$revision_id = $revision->getID();
286
+
$inline_list_uri = "/revision/inlines/{$revision_id}/";
287
+
$inline_list_uri = $this->getApplicationURI($inline_list_uri);
288
+
$changeset_view->setInlineListURI($inline_list_uri);
289
+
284
290
if ($repository) {
285
291
$changeset_view->setRepository($repository);
286
292
}
···
573
579
->setName(pht('Edit Revision'))
574
580
->setDisabled(!$can_edit)
575
581
->setWorkflow(!$can_edit));
576
-
577
-
$curtain->addAction(
578
-
id(new PhabricatorActionView())
579
-
->setIcon('fa-indent')
580
-
->setHref("/differential/revision/inlines/{$revision_id}/")
581
-
->setName(pht('List Inline Comments')));
582
582
583
583
$curtain->addAction(
584
584
id(new PhabricatorActionView())
+13
src/applications/differential/view/DifferentialChangesetListView.php
+13
src/applications/differential/view/DifferentialChangesetListView.php
···
14
14
private $standaloneURI;
15
15
private $leftRawFileURI;
16
16
private $rightRawFileURI;
17
+
private $inlineListURI;
17
18
18
19
private $symbolIndexes = array();
19
20
private $repository;
···
62
63
public function setInlineCommentControllerURI($uri) {
63
64
$this->inlineURI = $uri;
64
65
return $this;
66
+
}
67
+
68
+
public function setInlineListURI($uri) {
69
+
$this->inlineListURI = $uri;
70
+
return $this;
71
+
}
72
+
73
+
public function getInlineListURI() {
74
+
return $this->inlineListURI;
65
75
}
66
76
67
77
public function setRepository(PhabricatorRepository $repository) {
···
208
218
array(
209
219
'changesetViewIDs' => $ids,
210
220
'inlineURI' => $this->inlineURI,
221
+
'inlineListURI' => $this->inlineListURI,
211
222
'pht' => array(
212
223
'Open in Editor' => pht('Open in Editor'),
213
224
'Show All Context' => pht('Show All Context'),
···
285
296
'Hide Older Inlines' => pht('Hide Older Inlines'),
286
297
'Hide All Inlines' => pht('Hide All Inlines'),
287
298
'Show All Inlines' => pht('Show All Inlines'),
299
+
300
+
'List Inline Comments' => pht('List Inline Comments'),
288
301
),
289
302
));
290
303
+16
-1
webroot/rsrc/js/application/diff/DiffChangesetList.js
+16
-1
webroot/rsrc/js/application/diff/DiffChangesetList.js
···
88
88
89
89
properties: {
90
90
translations: null,
91
-
inlineURI: null
91
+
inlineURI: null,
92
+
inlineListURI: null
92
93
},
93
94
94
95
members: {
···
1648
1649
}
1649
1650
1650
1651
dropdown.listen('open', JX.bind(this, this._ondropdown));
1652
+
1653
+
var pht = this.getTranslations();
1654
+
1655
+
if (this.getInlineListURI()) {
1656
+
list.addItem(
1657
+
new JX.PHUIXActionView()
1658
+
.setDivider(true));
1659
+
1660
+
list.addItem(
1661
+
new JX.PHUIXActionView()
1662
+
.setIcon('fa-link')
1663
+
.setName(pht('List Inline Comments'))
1664
+
.setHref(this.getInlineListURI()));
1665
+
}
1651
1666
1652
1667
this._menuButton = button;
1653
1668
this._dropdownMenu = dropdown;
+2
-1
webroot/rsrc/js/application/differential/behavior-populate.js
+2
-1
webroot/rsrc/js/application/differential/behavior-populate.js
···
60
60
61
61
var changeset_list = new JX.DiffChangesetList()
62
62
.setTranslations(JX.phtize(config.pht))
63
-
.setInlineURI(config.inlineURI);
63
+
.setInlineURI(config.inlineURI)
64
+
.setInlineListURI(config.inlineListURI);
64
65
65
66
// Install and activate the current page.
66
67
var page_id = JX.Quicksand.getCurrentPageID();
+10
webroot/rsrc/js/phuix/PHUIXActionView.js
+10
webroot/rsrc/js/phuix/PHUIXActionView.js
···
16
16
_label: false,
17
17
_handler: null,
18
18
_selected: false,
19
+
_divider: false,
19
20
20
21
_iconNode: null,
21
22
_nameNode: null,
···
38
39
this.getNode(),
39
40
'phabricator-action-view-label',
40
41
label);
42
+
return this;
43
+
},
44
+
45
+
setDivider: function(divider) {
46
+
this._divider = divider;
47
+
JX.DOM.alterClass(
48
+
this.getNode(),
49
+
'phabricator-action-view-type-divider',
50
+
divider);
41
51
return this;
42
52
},
43
53