@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
Duct-tape the "z" haunted comment panel mode back together
Summary: Fixes T3898. This feature needs generalization at some point, but just unbreak it for now since a surprising number of users like it.
Test Plan: Pressed "z".
Reviewers: chad, btrahan
Reviewed By: chad
CC: chad, aran, spicyj
Maniphest Tasks: T3898
Differential Revision: https://secure.phabricator.com/D7366
+40
-24
+16
-16
src/__celerity_resource_map__.php
+16
-16
src/__celerity_resource_map__.php
···
1091
1091
),
1092
1092
'differential-revision-comment-css' =>
1093
1093
array(
1094
-
'uri' => '/res/42c222f4/rsrc/css/application/differential/revision-comment.css',
1094
+
'uri' => '/res/dc80fe37/rsrc/css/application/differential/revision-comment.css',
1095
1095
'type' => 'css',
1096
1096
'requires' =>
1097
1097
array(
···
4420
4420
'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js',
4421
4421
'type' => 'js',
4422
4422
),
4423
-
'7cd7e387' =>
4423
+
'0fe5af56' =>
4424
4424
array(
4425
4425
'name' => 'differential.pkg.css',
4426
4426
'symbols' =>
···
4439
4439
11 => 'differential-local-commits-view-css',
4440
4440
12 => 'inline-comment-summary-css',
4441
4441
),
4442
-
'uri' => '/res/pkg/7cd7e387/differential.pkg.css',
4442
+
'uri' => '/res/pkg/0fe5af56/differential.pkg.css',
4443
4443
'type' => 'css',
4444
4444
),
4445
4445
'5e9e5c4e' =>
···
4559
4559
'aphront-tokenizer-control-css' => 'c35f1eca',
4560
4560
'aphront-tooltip-css' => 'c35f1eca',
4561
4561
'aphront-typeahead-control-css' => 'c35f1eca',
4562
-
'differential-changeset-view-css' => '7cd7e387',
4563
-
'differential-core-view-css' => '7cd7e387',
4562
+
'differential-changeset-view-css' => '0fe5af56',
4563
+
'differential-core-view-css' => '0fe5af56',
4564
4564
'differential-inline-comment-editor' => '5e9e5c4e',
4565
-
'differential-local-commits-view-css' => '7cd7e387',
4566
-
'differential-results-table-css' => '7cd7e387',
4567
-
'differential-revision-add-comment-css' => '7cd7e387',
4568
-
'differential-revision-comment-css' => '7cd7e387',
4569
-
'differential-revision-comment-list-css' => '7cd7e387',
4570
-
'differential-revision-history-css' => '7cd7e387',
4571
-
'differential-revision-list-css' => '7cd7e387',
4572
-
'differential-table-of-contents-css' => '7cd7e387',
4565
+
'differential-local-commits-view-css' => '0fe5af56',
4566
+
'differential-results-table-css' => '0fe5af56',
4567
+
'differential-revision-add-comment-css' => '0fe5af56',
4568
+
'differential-revision-comment-css' => '0fe5af56',
4569
+
'differential-revision-comment-list-css' => '0fe5af56',
4570
+
'differential-revision-history-css' => '0fe5af56',
4571
+
'differential-revision-list-css' => '0fe5af56',
4572
+
'differential-table-of-contents-css' => '0fe5af56',
4573
4573
'diffusion-commit-view-css' => '270f4eb4',
4574
4574
'diffusion-icons-css' => '270f4eb4',
4575
4575
'global-drag-and-drop-css' => 'c35f1eca',
4576
-
'inline-comment-summary-css' => '7cd7e387',
4576
+
'inline-comment-summary-css' => '0fe5af56',
4577
4577
'javelin-aphlict' => '2c1dba03',
4578
4578
'javelin-behavior' => '3e3be199',
4579
4579
'javelin-behavior-aphlict-dropdown' => '2c1dba03',
···
4652
4652
'phabricator-action-list-view-css' => 'c35f1eca',
4653
4653
'phabricator-application-launch-view-css' => 'c35f1eca',
4654
4654
'phabricator-busy' => '2c1dba03',
4655
-
'phabricator-content-source-view-css' => '7cd7e387',
4655
+
'phabricator-content-source-view-css' => '0fe5af56',
4656
4656
'phabricator-core-css' => 'c35f1eca',
4657
4657
'phabricator-crumbs-view-css' => 'c35f1eca',
4658
4658
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
···
4670
4670
'phabricator-notification' => '2c1dba03',
4671
4671
'phabricator-notification-css' => 'c35f1eca',
4672
4672
'phabricator-notification-menu-css' => 'c35f1eca',
4673
-
'phabricator-object-selector-css' => '7cd7e387',
4673
+
'phabricator-object-selector-css' => '0fe5af56',
4674
4674
'phabricator-phtize' => '2c1dba03',
4675
4675
'phabricator-prefab' => '2c1dba03',
4676
4676
'phabricator-project-tag-css' => '49898640',
+15
-6
src/applications/differential/controller/DifferentialRevisionViewController.php
+15
-6
src/applications/differential/controller/DifferentialRevisionViewController.php
···
390
390
$comment_form->setDraft($draft);
391
391
$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
392
392
$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
393
+
394
+
// TODO: This just makes the "Z" key work. Generalize this and remove
395
+
// it at some point.
396
+
$comment_form = phutil_tag(
397
+
'div',
398
+
array(
399
+
'class' => 'differential-add-comment-panel',
400
+
),
401
+
$comment_form);
393
402
}
394
403
395
404
$pane_id = celerity_generate_unique_node_id();
···
403
412
$page_pane = id(new DifferentialPrimaryPaneView())
404
413
->setID($pane_id)
405
414
->appendChild(array(
406
-
$comment_view->render(),
407
-
$diff_history->render(),
415
+
$comment_view,
416
+
$diff_history,
408
417
$warning,
409
-
$local_view->render(),
410
-
$toc_view->render(),
418
+
$local_view,
419
+
$toc_view,
411
420
$other_view,
412
-
$changeset_view->render(),
421
+
$changeset_view,
413
422
));
414
423
if ($comment_form) {
415
-
$page_pane->appendChild($comment_form->render());
424
+
$page_pane->appendChild($comment_form);
416
425
} else {
417
426
// TODO: For now, just use this to get "Login to Comment".
418
427
$page_pane->appendChild(
+9
-2
webroot/rsrc/css/application/differential/revision-comment.css
+9
-2
webroot/rsrc/css/application/differential/revision-comment.css
···
26
26
left: 0;
27
27
overflow: auto;
28
28
max-height: 375px;
29
+
margin: 0;
29
30
30
31
box-shadow: 0 0 4px #000;
31
32
-webkit-box-shadow: 0 0 4px #000;
32
33
-moz-box-shadow: 0 0 4px #000;
33
34
}
34
35
36
+
.differential-haunt-mode-1 .differential-add-comment-panel .phui-box,
37
+
.differential-haunt-mode-2 .differential-add-comment-panel .phui-box {
38
+
margin: 0;
39
+
border-width: 0;
40
+
}
41
+
35
42
.differential-haunt-mode-2 .differential-add-comment-panel {
36
43
max-height: 75%;
37
44
}
38
45
39
-
.differential-haunt-mode-1 .differential-add-comment-panel h1,
40
-
.differential-haunt-mode-2 .differential-add-comment-panel h1 {
46
+
.differential-haunt-mode-1 .differential-add-comment-panel .phui-header-shell,
47
+
.differential-haunt-mode-2 .differential-add-comment-panel .phui-header-shell {
41
48
display: none;
42
49
}
43
50