Page MenuHomePhabricator
Files F15429596

D12019.id28928.diff
No OneTemporary
Actions

D12019.id28928.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
@@ -10,8 +10,8 @@
'core.pkg.css' => '6408f2d3',
'core.pkg.js' => '5a1c336d',
'darkconsole.pkg.js' => '8ab24e01',
- 'differential.pkg.css' => '5f5d3a4c',
- 'differential.pkg.js' => 'b1e76272',
+ 'differential.pkg.css' => '1940be3f',
+ 'differential.pkg.js' => '2b14c4a1',
'diffusion.pkg.css' => '591664fa',
'diffusion.pkg.js' => 'bfc0737b',
'maniphest.pkg.css' => '68d4dd3d',
@@ -55,7 +55,7 @@
'rsrc/css/application/dashboard/dashboard.css' => '17937d22',
'rsrc/css/application/diff/inline-comment-summary.css' => 'eb5f8e8c',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
- 'rsrc/css/application/differential/changeset-view.css' => 'f9011399',
+ 'rsrc/css/application/differential/changeset-view.css' => '6a8b172a',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/results-table.css' => '181aa9d9',
'rsrc/css/application/differential/revision-comment.css' => '48186045',
@@ -360,14 +360,14 @@
'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '82439934',
'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' => 'a90293f8',
+ 'rsrc/js/application/differential/ChangesetViewManager.js' => 'a9af1212',
'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => 'd3aa4b40',
'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' => '60b800bd',
+ 'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '7378d48a',
'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',
@@ -509,7 +509,7 @@
'aphront-two-column-view-css' => '16ab3ad2',
'aphront-typeahead-control-css' => '0e403212',
'auth-css' => '1e655982',
- 'changeset-view-manager' => 'a90293f8',
+ 'changeset-view-manager' => 'a9af1212',
'config-options-css' => '7fedf08b',
'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => '1ef6ae75',
@@ -518,7 +518,7 @@
'conpherence-notification-css' => '04a6e10a',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '3d575438',
- 'differential-changeset-view-css' => 'f9011399',
+ 'differential-changeset-view-css' => '6a8b172a',
'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'd3aa4b40',
'differential-results-table-css' => '181aa9d9',
@@ -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' => '60b800bd',
+ 'javelin-behavior-differential-edit-inline-comments' => '7378d48a',
'javelin-behavior-differential-feedback-preview' => '6932def3',
'javelin-behavior-differential-keyboard-navigation' => '2c426492',
'javelin-behavior-differential-populate' => '8694b1df',
@@ -1205,14 +1205,6 @@
'javelin-stratcom',
'javelin-dom',
),
- '60b800bd' => array(
- 'javelin-behavior',
- 'javelin-stratcom',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-vector',
- 'differential-inline-comment-editor',
- ),
'6153c708' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1324,6 +1316,14 @@
'javelin-behavior',
'javelin-dom',
),
+ '7378d48a' => array(
+ 'javelin-behavior',
+ 'javelin-stratcom',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-vector',
+ 'differential-inline-comment-editor',
+ ),
'73d09eef' => array(
'javelin-behavior',
'javelin-vector',
@@ -1629,7 +1629,7 @@
'javelin-uri',
'phabricator-keyboard-shortcut',
),
- 'a90293f8' => array(
+ 'a9af1212' => array(
'javelin-dom',
'javelin-util',
'javelin-stratcom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1139,6 +1139,7 @@
'PHUIDiffInlineCommentEditView' => 'infrastructure/diff/view/PHUIDiffInlineCommentEditView.php',
'PHUIDiffInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentRowScaffold.php',
'PHUIDiffInlineCommentTableScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php',
+ 'PHUIDiffInlineCommentUndoView' => 'infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php',
'PHUIDiffInlineCommentView' => 'infrastructure/diff/view/PHUIDiffInlineCommentView.php',
'PHUIDiffOneUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php',
'PHUIDiffTwoUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php',
@@ -4371,6 +4372,7 @@
'PHUIDiffInlineCommentEditView' => 'PHUIDiffInlineCommentView',
'PHUIDiffInlineCommentRowScaffold' => 'AphrontView',
'PHUIDiffInlineCommentTableScaffold' => 'AphrontView',
+ 'PHUIDiffInlineCommentUndoView' => 'PHUIDiffInlineCommentView',
'PHUIDiffInlineCommentView' => 'AphrontView',
'PHUIDiffOneUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
'PHUIDiffTwoUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
@@ -217,7 +217,8 @@
return id(new PhabricatorChangesetResponse())
->setRenderedChangeset($parser->renderChangeset())
- ->setCoverage($coverage);
+ ->setCoverage($coverage)
+ ->setUndoTemplates($parser->getRenderer()->renderUndoTemplates());
}
$diff = $changeset->getDiff();
diff --git a/src/applications/differential/render/DifferentialChangesetRenderer.php b/src/applications/differential/render/DifferentialChangesetRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetRenderer.php
@@ -600,4 +600,19 @@
return array($old, $new);
}
+ public function renderUndoTemplates() {
+ $views = array(
+ 'l' => id(new PHUIDiffInlineCommentUndoView())->setIsOnRight(false),
+ 'r' => id(new PHUIDiffInlineCommentUndoView())->setIsOnRight(true),
+ );
+
+ foreach ($views as $key => $view) {
+ $scaffold = $this->getRowScaffoldForInline($view);
+ $views[$key] = id(new PHUIDiffInlineCommentTableScaffold())
+ ->addRowScaffold($scaffold);
+ }
+
+ return $views;
+ }
+
}
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -208,6 +208,9 @@
$icon = id(new PHUIIconView())
->setIconFont($display_icon);
+ $renderer = DifferentialChangesetHTMLRenderer::getHTMLRendererByKey(
+ $this->getRenderer());
+
return javelin_tag(
'div',
array(
@@ -224,6 +227,7 @@
'ref' => $this->getRenderingRef(),
'autoload' => $this->getAutoload(),
'loaded' => $this->getLoaded(),
+ 'undoTemplates' => $renderer->renderUndoTemplates(),
),
'class' => $class,
'id' => $id,
@@ -252,4 +256,5 @@
));
}
+
}
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -123,6 +123,7 @@
'collapsed' => pht('This file content has been collapsed.'),
),
));
+
Javelin::initBehavior(
'differential-dropdown-menus',
array(
@@ -230,11 +231,8 @@
$this->initBehavior('differential-comment-jump', array());
if ($this->inlineURI) {
- $undo_templates = $this->renderUndoTemplates();
-
Javelin::initBehavior('differential-edit-inline-comments', array(
'uri' => $this->inlineURI,
- 'undo_templates' => $undo_templates,
'stage' => 'differential-review-stage',
));
}
@@ -257,44 +255,6 @@
return $object_box;
}
- /**
- * Render the "Undo" markup for the inline comment undo feature.
- */
- private function renderUndoTemplates() {
- $link = javelin_tag(
- 'a',
- array(
- 'href' => '#',
- 'sigil' => 'differential-inline-comment-undo',
- ),
- pht('Undo'));
-
- $div = phutil_tag(
- 'div',
- array(
- 'class' => 'differential-inline-undo',
- ),
- array('Changes discarded. ', $link));
-
- return array(
- 'l' => phutil_tag('table', array(),
- phutil_tag('tr', array(), array(
- phutil_tag('th', array()),
- phutil_tag('td', array(), $div),
- phutil_tag('th', array()),
- phutil_tag('td', array('colspan' => 3)),
- ))),
-
- 'r' => phutil_tag('table', array(),
- phutil_tag('tr', array(), array(
- phutil_tag('th', array()),
- phutil_tag('td', array()),
- phutil_tag('th', array()),
- phutil_tag('td', array('colspan' => 3), $div),
- ))),
- );
- }
-
private function renderViewOptionsDropdown(
DifferentialChangesetDetailView $detail,
$ref,
diff --git a/src/applications/diffusion/controller/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
--- a/src/applications/diffusion/controller/DiffusionDiffController.php
+++ b/src/applications/diffusion/controller/DiffusionDiffController.php
@@ -130,6 +130,7 @@
$parser->setMask($mask);
return id(new PhabricatorChangesetResponse())
- ->setRenderedChangeset($parser->renderChangeset());
+ ->setRenderedChangeset($parser->renderChangeset())
+ ->setUndoTemplates($parser->getRenderer()->renderUndoTemplates());
}
}
diff --git a/src/infrastructure/diff/PhabricatorChangesetResponse.php b/src/infrastructure/diff/PhabricatorChangesetResponse.php
--- a/src/infrastructure/diff/PhabricatorChangesetResponse.php
+++ b/src/infrastructure/diff/PhabricatorChangesetResponse.php
@@ -4,6 +4,7 @@
private $renderedChangeset;
private $coverage;
+ private $undoTemplates;
public function setRenderedChangeset($rendered_changeset) {
$this->renderedChangeset = $rendered_changeset;
@@ -15,6 +16,11 @@
return $this;
}
+ public function setUndoTemplates($undo_templates) {
+ $this->undoTemplates = $undo_templates;
+ return $this;
+ }
+
protected function buildProxy() {
return new AphrontAjaxResponse();
}
@@ -28,6 +34,10 @@
$content['coverage'] = $this->coverage;
}
+ if ($this->undoTemplates) {
+ $content['undoTemplates'] = $this->undoTemplates;
+ }
+
return $this->getProxy()->setContent($content);
}
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php
new file mode 100644
--- /dev/null
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Render the "Undo" action to recover discarded inline comments.
+ *
+ * This extends @{class:PHUIDiffInlineCommentView} so it can use the same
+ * scaffolding code as other kinds of inline comments.
+ */
+final class PHUIDiffInlineCommentUndoView
+ extends PHUIDiffInlineCommentView {
+
+ private $isOnRight;
+
+ public function setIsOnRight($is_on_right) {
+ $this->isOnRight = $is_on_right;
+ return $this;
+ }
+
+ public function getIsOnRight() {
+ return $this->isOnRight;
+ }
+
+ public function render() {
+ $link = javelin_tag(
+ 'a',
+ array(
+ 'href' => '#',
+ 'sigil' => 'differential-inline-comment-undo',
+ ),
+ pht('Undo'));
+
+ return phutil_tag(
+ 'div',
+ array(
+ 'class' => 'differential-inline-undo',
+ ),
+ array('Changes discarded. ', $link));
+ }
+
+}
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -379,10 +379,12 @@
.differential-inline-undo {
padding: 4px;
text-align: center;
- background: #ffeeaa;
+ background: {$lightyellow};
+ border: 1px solid {$yellow};
margin: 3px 0 1px;
- font: 12px;
- color: 444444;
+ color: {$darkgreytext};
+ font: {$basefont};
+ font-size: 12px;
}
.differential-inline-undo a {
diff --git a/webroot/rsrc/js/application/differential/ChangesetViewManager.js b/webroot/rsrc/js/application/differential/ChangesetViewManager.js
--- a/webroot/rsrc/js/application/differential/ChangesetViewManager.js
+++ b/webroot/rsrc/js/application/differential/ChangesetViewManager.js
@@ -38,6 +38,7 @@
_renderer: null,
_highlight: null,
_encoding: null,
+ _undoTemplates: null,
/**
@@ -193,6 +194,8 @@
var root = target.parentNode;
this._moveRows(table, root, target);
root.removeChild(target);
+
+ this._onchangesetresponse(response);
},
_moveRows: function(src, dst, before) {
@@ -256,6 +259,10 @@
return (JX.Device.getDevice() == 'desktop') ? '2up' : '1up';
},
+ getUndoTemplates: function() {
+ return this._undoTemplates;
+ },
+
setEncoding: function(encoding) {
this._encoding = encoding;
return this;
@@ -333,6 +340,12 @@
this._stabilize = false;
}
+ this._onchangesetresponse(response);
+ },
+
+ _onchangesetresponse: function(response) {
+ // Code shared by autoload and context responses.
+
if (response.coverage) {
for (var k in response.coverage) {
try {
@@ -342,6 +355,10 @@
}
}
}
+
+ if (response.undoTemplates) {
+ this._undoTemplates = response.undoTemplates;
+ }
},
_getContentFrame: function() {
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
@@ -243,7 +243,7 @@
var view = JX.ChangesetViewManager.getForNode(root);
editor = new JX.DifferentialInlineCommentEditor(config.uri)
- .setTemplates(config.undo_templates)
+ .setTemplates(view.getUndoTemplates())
.setOperation('new')
.setChangesetID(changeset)
.setLineNumber(o)
@@ -335,7 +335,7 @@
var view = JX.ChangesetViewManager.getForNode(changeset_root);
editor = new JX.DifferentialInlineCommentEditor(config.uri)
- .setTemplates(config.undo_templates)
+ .setTemplates(view.getUndoTemplates())
.setOperation(op)
.setID(data.id)
.setChangesetID(data.changesetID)

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 3:04 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7704608
Default Alt Text
D12019.id28928.diff (16 KB)

Event Timeline

Phabricator · Built by Phacility