Page MenuHomePhabricator
Files F73112

D7366.diff
All Users
Actions

D7366.diff
View Options

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1091,7 +1091,7 @@
),
'differential-revision-comment-css' =>
array(
- 'uri' => '/res/42c222f4/rsrc/css/application/differential/revision-comment.css',
+ 'uri' => '/res/dc80fe37/rsrc/css/application/differential/revision-comment.css',
'type' => 'css',
'requires' =>
array(
@@ -4420,7 +4420,7 @@
'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js',
'type' => 'js',
),
- '7cd7e387' =>
+ '0fe5af56' =>
array(
'name' => 'differential.pkg.css',
'symbols' =>
@@ -4439,7 +4439,7 @@
11 => 'differential-local-commits-view-css',
12 => 'inline-comment-summary-css',
),
- 'uri' => '/res/pkg/7cd7e387/differential.pkg.css',
+ 'uri' => '/res/pkg/0fe5af56/differential.pkg.css',
'type' => 'css',
),
'5e9e5c4e' =>
@@ -4559,21 +4559,21 @@
'aphront-tokenizer-control-css' => 'c35f1eca',
'aphront-tooltip-css' => 'c35f1eca',
'aphront-typeahead-control-css' => 'c35f1eca',
- 'differential-changeset-view-css' => '7cd7e387',
- 'differential-core-view-css' => '7cd7e387',
+ 'differential-changeset-view-css' => '0fe5af56',
+ 'differential-core-view-css' => '0fe5af56',
'differential-inline-comment-editor' => '5e9e5c4e',
- 'differential-local-commits-view-css' => '7cd7e387',
- 'differential-results-table-css' => '7cd7e387',
- 'differential-revision-add-comment-css' => '7cd7e387',
- 'differential-revision-comment-css' => '7cd7e387',
- 'differential-revision-comment-list-css' => '7cd7e387',
- 'differential-revision-history-css' => '7cd7e387',
- 'differential-revision-list-css' => '7cd7e387',
- 'differential-table-of-contents-css' => '7cd7e387',
+ 'differential-local-commits-view-css' => '0fe5af56',
+ 'differential-results-table-css' => '0fe5af56',
+ 'differential-revision-add-comment-css' => '0fe5af56',
+ 'differential-revision-comment-css' => '0fe5af56',
+ 'differential-revision-comment-list-css' => '0fe5af56',
+ 'differential-revision-history-css' => '0fe5af56',
+ 'differential-revision-list-css' => '0fe5af56',
+ 'differential-table-of-contents-css' => '0fe5af56',
'diffusion-commit-view-css' => '270f4eb4',
'diffusion-icons-css' => '270f4eb4',
'global-drag-and-drop-css' => 'c35f1eca',
- 'inline-comment-summary-css' => '7cd7e387',
+ 'inline-comment-summary-css' => '0fe5af56',
'javelin-aphlict' => '2c1dba03',
'javelin-behavior' => '3e3be199',
'javelin-behavior-aphlict-dropdown' => '2c1dba03',
@@ -4652,7 +4652,7 @@
'phabricator-action-list-view-css' => 'c35f1eca',
'phabricator-application-launch-view-css' => 'c35f1eca',
'phabricator-busy' => '2c1dba03',
- 'phabricator-content-source-view-css' => '7cd7e387',
+ 'phabricator-content-source-view-css' => '0fe5af56',
'phabricator-core-css' => 'c35f1eca',
'phabricator-crumbs-view-css' => 'c35f1eca',
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
@@ -4670,7 +4670,7 @@
'phabricator-notification' => '2c1dba03',
'phabricator-notification-css' => 'c35f1eca',
'phabricator-notification-menu-css' => 'c35f1eca',
- 'phabricator-object-selector-css' => '7cd7e387',
+ 'phabricator-object-selector-css' => '0fe5af56',
'phabricator-phtize' => '2c1dba03',
'phabricator-prefab' => '2c1dba03',
'phabricator-project-tag-css' => '49898640',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -390,6 +390,15 @@
$comment_form->setDraft($draft);
$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
+
+ // TODO: This just makes the "Z" key work. Generalize this and remove
+ // it at some point.
+ $comment_form = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'differential-add-comment-panel',
+ ),
+ $comment_form);
}
$pane_id = celerity_generate_unique_node_id();
@@ -403,16 +412,16 @@
$page_pane = id(new DifferentialPrimaryPaneView())
->setID($pane_id)
->appendChild(array(
- $comment_view->render(),
- $diff_history->render(),
+ $comment_view,
+ $diff_history,
$warning,
- $local_view->render(),
- $toc_view->render(),
+ $local_view,
+ $toc_view,
$other_view,
- $changeset_view->render(),
+ $changeset_view,
));
if ($comment_form) {
- $page_pane->appendChild($comment_form->render());
+ $page_pane->appendChild($comment_form);
} else {
// TODO: For now, just use this to get "Login to Comment".
$page_pane->appendChild(
diff --git a/webroot/rsrc/css/application/differential/revision-comment.css b/webroot/rsrc/css/application/differential/revision-comment.css
--- a/webroot/rsrc/css/application/differential/revision-comment.css
+++ b/webroot/rsrc/css/application/differential/revision-comment.css
@@ -26,18 +26,25 @@
left: 0;
overflow: auto;
max-height: 375px;
+ margin: 0;
box-shadow: 0 0 4px #000;
-webkit-box-shadow: 0 0 4px #000;
-moz-box-shadow: 0 0 4px #000;
}
+.differential-haunt-mode-1 .differential-add-comment-panel .phui-box,
+.differential-haunt-mode-2 .differential-add-comment-panel .phui-box {
+ margin: 0;
+ border-width: 0;
+}
+
.differential-haunt-mode-2 .differential-add-comment-panel {
max-height: 75%;
}
-.differential-haunt-mode-1 .differential-add-comment-panel h1,
-.differential-haunt-mode-2 .differential-add-comment-panel h1 {
+.differential-haunt-mode-1 .differential-add-comment-panel .phui-header-shell,
+.differential-haunt-mode-2 .differential-add-comment-panel .phui-header-shell {
display: none;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/wv/ic/wj66ln4mke65fyq7
Default Alt Text
D7366.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility