mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-14 10:52:41 +01:00
94d0adb140
Summary: When a user hits 'cancel' on a 'new', 'edit', or 'reply' operation, add a little "Changes discarded. __Undo__" insert so they can get their change back. No undo for delete since there's an explicit prompt. Once this lands we can make 'escape' work again to close dialogs. This change started feeling really good when I was merging all the duplicate code and making things more consistent, but by the time I started writing client rendering it felt gross. I'm not really thrilled with it but I guess it's a step forward? The feature seems pretty OK in practice. Let me know how much barfing this causes and I can try to remedy the most acute concerns. This also fixes a bug where replies always (?) appear on the 'new' side of the diff (I think?). Test Plan: Applied 'new', 'edit', 'delete' and 'reply' operations, pressed 'cancel' and 'okay' in each case, with and without changing text where relevant. All behaviors seem to conform with expectations, except that canceling out of 'edit' without changing the text gives you an option to undo when it shouldn't really. There's no super easy way to get at the original text right now. Reviewed By: aran Reviewers: aran, jungejason, tuomaspelkonen CC: simpkins, aran, epriestley Differential Revision: 406
198 lines
4.7 KiB
PHP
198 lines
4.7 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright 2011 Facebook, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
final class DifferentialInlineCommentView extends AphrontView {
|
|
|
|
private $inlineComment;
|
|
private $onRight;
|
|
private $buildScaffolding;
|
|
private $handles;
|
|
private $markupEngine;
|
|
private $editable;
|
|
|
|
public function setInlineComment(DifferentialInlineComment $comment) {
|
|
$this->inlineComment = $comment;
|
|
return $this;
|
|
}
|
|
|
|
public function setOnRight($on_right) {
|
|
$this->onRight = $on_right;
|
|
return $this;
|
|
}
|
|
|
|
public function setBuildScaffolding($scaffold) {
|
|
$this->buildScaffolding = $scaffold;
|
|
return $this;
|
|
}
|
|
|
|
public function setHandles(array $handles) {
|
|
$this->handles = $handles;
|
|
return $this;
|
|
}
|
|
|
|
public function setMarkupEngine(PhutilMarkupEngine $engine) {
|
|
$this->markupEngine = $engine;
|
|
return $this;
|
|
}
|
|
|
|
public function setEditable($editable) {
|
|
$this->editable = $editable;
|
|
return $this;
|
|
}
|
|
|
|
public function render() {
|
|
|
|
$inline = $this->inlineComment;
|
|
|
|
$start = $inline->getLineNumber();
|
|
$length = $inline->getLineLength();
|
|
if ($length) {
|
|
$end = $start + $length;
|
|
$line = 'Lines '.number_format($start).'-'.number_format($end);
|
|
} else {
|
|
$line = 'Line '.number_format($start);
|
|
}
|
|
|
|
$metadata = array(
|
|
'id' => $inline->getID(),
|
|
'number' => $inline->getLineNumber(),
|
|
'length' => $inline->getLineLength(),
|
|
'on_right' => $this->onRight,
|
|
'original' => $inline->getContent(),
|
|
);
|
|
|
|
$sigil = 'differential-inline-comment';
|
|
|
|
$content = $inline->getContent();
|
|
$handles = $this->handles;
|
|
|
|
$links = array();
|
|
|
|
$links[] = javelin_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => '#',
|
|
'mustcapture' => true,
|
|
'sigil' => 'differential-inline-prev',
|
|
),
|
|
'Previous');
|
|
|
|
$links[] = javelin_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => '#',
|
|
'mustcapture' => true,
|
|
'sigil' => 'differential-inline-next',
|
|
),
|
|
'Next');
|
|
|
|
$links[] = javelin_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => '#',
|
|
'mustcapture' => true,
|
|
'sigil' => 'differential-inline-reply',
|
|
),
|
|
'Reply');
|
|
|
|
if ($this->editable) {
|
|
$links[] = javelin_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => '#',
|
|
'mustcapture' => true,
|
|
'sigil' => 'differential-inline-edit',
|
|
),
|
|
'Edit');
|
|
$links[] = javelin_render_tag(
|
|
'a',
|
|
array(
|
|
'href' => '#',
|
|
'mustcapture' => true,
|
|
'sigil' => 'differential-inline-delete',
|
|
),
|
|
'Delete');
|
|
}
|
|
|
|
if ($links) {
|
|
$links =
|
|
'<span class="differential-inline-comment-links">'.
|
|
implode(' · ', $links).
|
|
'</span>';
|
|
} else {
|
|
$links = null;
|
|
}
|
|
|
|
$cache = $inline->getCache();
|
|
if (strlen($cache)) {
|
|
$content = $cache;
|
|
} else {
|
|
$content = $this->markupEngine->markupText($content);
|
|
if ($inline->getID()) {
|
|
$inline->setCache($content);
|
|
$inline->save();
|
|
}
|
|
}
|
|
|
|
$anchor = phutil_render_tag(
|
|
'a',
|
|
array(
|
|
'name' => 'inline-'.$inline->getID(),
|
|
),
|
|
'');
|
|
|
|
$markup = javelin_render_tag(
|
|
'div',
|
|
array(
|
|
'class' => 'differential-inline-comment',
|
|
'sigil' => $sigil,
|
|
'meta' => $metadata,
|
|
),
|
|
'<div class="differential-inline-comment-head">'.
|
|
$anchor.
|
|
$links.
|
|
'<span class="differential-inline-comment-line">'.$line.'</span>'.
|
|
phutil_escape_html($handles[$inline->getAuthorPHID()]->getName()).
|
|
'</div>'.
|
|
'<div class="phabricator-remarkup">'.
|
|
$content.
|
|
'</div>');
|
|
|
|
return $this->scaffoldMarkup($markup);
|
|
}
|
|
|
|
private function scaffoldMarkup($markup) {
|
|
if (!$this->buildScaffolding) {
|
|
return $markup;
|
|
}
|
|
|
|
$left_markup = !$this->onRight ? $markup : '';
|
|
$right_markup = $this->onRight ? $markup : '';
|
|
|
|
return
|
|
'<table>'.
|
|
'<tr class="inline">'.
|
|
'<th></th>'.
|
|
'<td>'.$left_markup.'</td>'.
|
|
'<th></th>'.
|
|
'<td>'.$right_markup.'</td>'.
|
|
'</tr>'.
|
|
'</table>';
|
|
}
|
|
|
|
}
|