Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13175096
D11988.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
13 KB
Referenced Files
None
Subscribers
None
D11988.id.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -11,7 +11,7 @@
'core.pkg.js' => 'a77025a1',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '6641cdd5',
- 'differential.pkg.js' => 'e260829c',
+ 'differential.pkg.js' => '3fab5259',
'diffusion.pkg.css' => '591664fa',
'diffusion.pkg.js' => 'bfc0737b',
'maniphest.pkg.css' => '68d4dd3d',
@@ -361,13 +361,13 @@
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
'rsrc/js/application/differential/ChangesetViewManager.js' => 'fce415a0',
- 'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => '6a049cf7',
+ 'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => '41060c54',
'rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js' => 'e10f8e18',
'rsrc/js/application/differential/behavior-comment-jump.js' => '4fdb476d',
'rsrc/js/application/differential/behavior-comment-preview.js' => '6932def3',
'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
'rsrc/js/application/differential/behavior-dropdown-menus.js' => '2035b9cb',
- 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => 'f159658c',
+ 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => 'ae8e9b44',
'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492',
'rsrc/js/application/differential/behavior-populate.js' => '8694b1df',
'rsrc/js/application/differential/behavior-show-field-details.js' => 'bba9eedf',
@@ -520,7 +520,7 @@
'conpherence-widget-pane-css' => '3d575438',
'differential-changeset-view-css' => 'bad09138',
'differential-core-view-css' => '7ac3cabc',
- 'differential-inline-comment-editor' => '6a049cf7',
+ 'differential-inline-comment-editor' => '41060c54',
'differential-results-table-css' => '181aa9d9',
'differential-revision-add-comment-css' => 'c478bcaa',
'differential-revision-comment-css' => '48186045',
@@ -569,7 +569,7 @@
'javelin-behavior-differential-comment-jump' => '4fdb476d',
'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
'javelin-behavior-differential-dropdown-menus' => '2035b9cb',
- 'javelin-behavior-differential-edit-inline-comments' => 'f159658c',
+ 'javelin-behavior-differential-edit-inline-comments' => 'ae8e9b44',
'javelin-behavior-differential-feedback-preview' => '6932def3',
'javelin-behavior-differential-keyboard-navigation' => '2c426492',
'javelin-behavior-differential-populate' => '8694b1df',
@@ -1065,6 +1065,14 @@
'phuix-action-list-view',
'phuix-action-view',
),
+ '41060c54' => array(
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-install',
+ 'javelin-request',
+ 'javelin-workflow',
+ ),
42126667 => array(
'javelin-behavior',
'javelin-dom',
@@ -1238,14 +1246,6 @@
'69adf288' => array(
'javelin-install',
),
- '6a049cf7' => array(
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-install',
- 'javelin-request',
- 'javelin-workflow',
- ),
'6c2b09a2' => array(
'javelin-install',
'javelin-util',
@@ -1644,6 +1644,14 @@
'javelin-util',
'phabricator-prefab',
),
+ 'ae8e9b44' => array(
+ 'javelin-behavior',
+ 'javelin-stratcom',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-vector',
+ 'differential-inline-comment-editor',
+ ),
'b1f0ccee' => array(
'javelin-install',
'javelin-dom',
@@ -1874,14 +1882,6 @@
'javelin-install',
'javelin-util',
),
- 'f159658c' => array(
- 'javelin-behavior',
- 'javelin-stratcom',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-vector',
- 'differential-inline-comment-editor',
- ),
'f24f3253' => array(
'javelin-behavior',
'javelin-dom',
diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php
--- a/src/applications/differential/view/DifferentialInlineCommentEditView.php
+++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php
@@ -8,6 +8,16 @@
private $onRight;
private $number;
private $length;
+ private $renderer;
+
+ public function setRenderer($renderer) {
+ $this->renderer = $renderer;
+ return $this;
+ }
+
+ public function getRenderer() {
+ return $this->renderer;
+ }
public function addHiddenInput($key, $value) {
$this->inputs[] = array($key, $value);
@@ -60,10 +70,17 @@
$this->renderBody(),
));
- return phutil_tag('table', array(), phutil_tag(
- 'tr',
- array('class' => 'inline-comment-splint'),
- array(
+ if ($this->renderer == '1up') {
+ $cells = array(
+ phutil_tag('th', array()),
+ phutil_tag('th', array()),
+ phutil_tag(
+ 'td',
+ array('colspan' => 3, 'class' => 'right3'),
+ $content),
+ );
+ } else {
+ $cells = array(
phutil_tag('th', array()),
phutil_tag(
'td',
@@ -74,7 +91,11 @@
'td',
array('colspan' => 3, 'class' => 'right3'),
$this->onRight ? $content : null),
- )));
+ );
+ }
+
+ $row = phutil_tag('tr', array('class' => 'inline-comment-splint'), $cells);
+ return phutil_tag('table', array(), $row);
}
private function renderInputs() {
diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php
--- a/src/applications/differential/view/DifferentialInlineCommentView.php
+++ b/src/applications/differential/view/DifferentialInlineCommentView.php
@@ -10,6 +10,7 @@
private $editable;
private $preview;
private $allowReply;
+ private $renderer;
public function setInlineComment(PhabricatorInlineCommentInterface $comment) {
$this->inlineComment = $comment;
@@ -52,6 +53,15 @@
return $this;
}
+ public function setRenderer($renderer) {
+ $this->renderer = $renderer;
+ return $this;
+ }
+
+ public function getRenderer() {
+ return $this->renderer;
+ }
+
public function render() {
$inline = $this->inlineComment;
@@ -251,11 +261,20 @@
return $markup;
}
- $left_markup = !$this->onRight ? $markup : '';
- $right_markup = $this->onRight ? $markup : '';
+ if ($this->renderer == '1up') {
+ $cells = array(
+ phutil_tag('th', array()),
+ phutil_tag('th', array()),
+ phutil_tag(
+ 'td',
+ array('colspan' => 3, 'class' => 'right3'),
+ $markup),
+ );
+ } else {
+ $left_markup = !$this->onRight ? $markup : '';
+ $right_markup = $this->onRight ? $markup : '';
- return phutil_tag('table', array(),
- phutil_tag('tr', array(), array(
+ $cells = array(
phutil_tag('th', array()),
phutil_tag('td', array('class' => 'left'), $left_markup),
phutil_tag('th', array()),
@@ -263,7 +282,11 @@
'td',
array('colspan' => 3, 'class' => 'right3'),
$right_markup),
- )));
+ );
+ }
+
+ $row = phutil_tag('tr', array(), $cells);
+ return phutil_tag('table', array(), $row);
}
}
diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -19,6 +19,7 @@
private $commentText;
private $operation;
private $commentID;
+ private $renderer;
public function getCommentID() {
return $this->commentID;
@@ -52,6 +53,14 @@
return $this->isNewFile;
}
+ public function setRenderer($renderer) {
+ $this->renderer = $renderer;
+ return $this;
+ }
+
+ public function getRenderer() {
+ return $this->renderer;
+ }
public function processRequest() {
$request = $this->getRequest();
@@ -113,7 +122,6 @@
return id(new AphrontAjaxResponse())
->setContent($edit_dialog->render());
case 'create':
-
$text = $this->getCommentText();
if (!$request->isFormPost() || !strlen($text)) {
@@ -157,6 +165,7 @@
$edit_dialog->addHiddenInput('is_new', $is_new);
$edit_dialog->addHiddenInput('number', $number);
$edit_dialog->addHiddenInput('length', $length);
+ $edit_dialog->addHiddenInput('renderer', $this->getRenderer());
$text_area = $this->renderTextArea($this->getCommentText());
$edit_dialog->appendChild($text_area);
@@ -171,27 +180,29 @@
// NOTE: This isn't necessarily a DifferentialChangeset ID, just an
// application identifier for the changeset. In Diffusion, it's a Path ID.
- $this->changesetID = $request->getInt('changeset');
-
- $this->isNewFile = (int)$request->getBool('is_new');
- $this->isOnRight = $request->getBool('on_right');
- $this->lineNumber = $request->getInt('number');
- $this->lineLength = $request->getInt('length');
- $this->commentText = $request->getStr('text');
- $this->commentID = $request->getInt('id');
- $this->operation = $request->getStr('op');
+ $this->changesetID = $request->getInt('changeset');
+
+ $this->isNewFile = (int)$request->getBool('is_new');
+ $this->isOnRight = $request->getBool('on_right');
+ $this->lineNumber = $request->getInt('number');
+ $this->lineLength = $request->getInt('length');
+ $this->commentText = $request->getStr('text');
+ $this->commentID = $request->getInt('id');
+ $this->operation = $request->getStr('op');
+ $this->renderer = $request->getStr('renderer');
}
private function buildEditDialog() {
$request = $this->getRequest();
$user = $request->getUser();
- $edit_dialog = new DifferentialInlineCommentEditView();
- $edit_dialog->setUser($user);
- $edit_dialog->setSubmitURI($request->getRequestURI());
- $edit_dialog->setOnRight($this->getIsOnRight());
- $edit_dialog->setNumber($this->getLineNumber());
- $edit_dialog->setLength($this->getLineLength());
+ $edit_dialog = id(new DifferentialInlineCommentEditView())
+ ->setUser($user)
+ ->setSubmitURI($request->getRequestURI())
+ ->setOnRight($this->getIsOnRight())
+ ->setNumber($this->getLineNumber())
+ ->setLength($this->getLineLength())
+ ->setRenderer($this->getRenderer());
return $edit_dialog;
}
@@ -200,7 +211,7 @@
return id(new AphrontAjaxResponse())
->setContent(
array(
- 'markup' => '',
+ 'markup' => '',
));
}
@@ -222,13 +233,14 @@
$handles = $this->loadViewerHandles($phids);
- $view = new DifferentialInlineCommentView();
- $view->setInlineComment($inline);
- $view->setOnRight($on_right);
- $view->setBuildScaffolding(true);
- $view->setMarkupEngine($engine);
- $view->setHandles($handles);
- $view->setEditable(true);
+ $view = id(new DifferentialInlineCommentView())
+ ->setInlineComment($inline)
+ ->setOnRight($on_right)
+ ->setBuildScaffolding(true)
+ ->setMarkupEngine($engine)
+ ->setHandles($handles)
+ ->setEditable(true)
+ ->setRenderer($this->getRenderer());
return id(new AphrontAjaxResponse())
->setContent(
diff --git a/webroot/rsrc/js/application/differential/DifferentialInlineCommentEditor.js b/webroot/rsrc/js/application/differential/DifferentialInlineCommentEditor.js
--- a/webroot/rsrc/js/application/differential/DifferentialInlineCommentEditor.js
+++ b/webroot/rsrc/js/application/differential/DifferentialInlineCommentEditor.js
@@ -35,7 +35,8 @@
is_new : this.getIsNew(),
length : this.getLength(),
changeset : this.getChangeset(),
- text : this.getText() || ''
+ text : this.getText() || '',
+ renderer: this.getRenderer()
};
},
_draw : function(content, exact_row) {
@@ -288,7 +289,8 @@
isNew : null,
text : null,
templates : null,
- originalText : null
+ originalText : null,
+ renderer: null
}
});
diff --git a/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js b/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js
--- a/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js
+++ b/webroot/rsrc/js/application/differential/behavior-edit-inline-comments.js
@@ -150,6 +150,8 @@
insert = target.parentNode;
}
+ var view = JX.ChangesetViewManager.getForNode(root);
+
editor = new JX.DifferentialInlineCommentEditor(config.uri)
.setTemplates(config.undo_templates)
.setOperation('new')
@@ -160,6 +162,7 @@
.setOnRight(isOnRight(target) ? 1 : 0)
.setRow(insert.nextSibling)
.setTable(insert.parentNode)
+ .setRenderer(view.getRenderer())
.start();
set_link_state(true);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 9 2024, 3:19 AM (4 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6273892
Default Alt Text
D11988.id.diff (13 KB)
Attached To
Mode
D11988: Improve behavior of inline rendering with unified views
Attached
Detach File
Event Timeline
Log In to Comment