No OneTemporary
Actions

Size

22 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php
	index a2318eb069..88c1b176ff 100644
	--- a/src/applications/differential/view/DifferentialInlineCommentEditView.php
	+++ b/src/applications/differential/view/DifferentialInlineCommentEditView.php
	@@ -1,160 +1,149 @@
	<?php

	final class DifferentialInlineCommentEditView extends AphrontView {

	private $inputs = array();
	private $uri;
	private $title;
	private $onRight;
	private $number;
	private $length;

	public function addHiddenInput($key, $value) {
	$this->inputs[] = array($key, $value);
	return $this;
	}

	public function setSubmitURI($uri) {
	$this->uri = $uri;
	return $this;
	}

	public function setTitle($title) {
	$this->title = $title;
	return $this;
	}

	public function setOnRight($on_right) {
	$this->onRight = $on_right;
	$this->addHiddenInput('on_right', $on_right);
	return $this;
	}

	public function setNumber($number) {
	$this->number = $number;
	return $this;
	}

	public function setLength($length) {
	$this->length = $length;
	return $this;
	}

	public function render() {
	if (!$this->uri) {
	throw new Exception("Call setSubmitURI() before render()!");
	}
	if (!$this->user) {
	throw new Exception("Call setUser() before render()!");
	}

	$content = phabricator_form(
	$this->user,
	array(
	'action' => $this->uri,
	'method' => 'POST',
	'sigil' => 'inline-edit-form',
	),
	array(
	$this->renderInputs(),
	$this->renderBody(),
	));

	return phutil_tag('table', array(), phutil_tag(
	'tr',
	array('class' => 'inline-comment-splint'),
	array(
	phutil_tag('th', array()),
	phutil_tag(
	'td',
	array('class' => 'left'),
	$this->onRight ? null : $content),
	phutil_tag('th', array()),
	phutil_tag(
	'td',
	array('colspan' => 3, 'class' => 'right3'),
	$this->onRight ? $content : null),
	)));
	}

	private function renderInputs() {
	$out = array();
	foreach ($this->inputs as $input) {
	list($name, $value) = $input;
	$out[] = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => $name,
	'value' => $value,
	));
	}
	return $out;
	}

	private function renderBody() {
	$buttons = array();

	$buttons[] = phutil_tag('button', array(), 'Ready');
	$buttons[] = javelin_tag(
	'button',
	array(
	'sigil' => 'inline-edit-cancel',
	'class' => 'grey',
	),
	pht('Cancel'));

	- $formatting = phutil_tag(
	- 'a',
	- array(
	- 'href' => PhabricatorEnv::getDoclink(
	- 'article/Remarkup_Reference.html'),
	- 'tabindex' => '-1',
	- 'target' => '_blank',
	- ),
	- pht('Formatting Reference'));
	-
	$title = phutil_tag(
	'div',
	array(
	'class' => 'differential-inline-comment-edit-title',
	),
	$this->title);

	$body = phutil_tag(
	'div',
	array(
	'class' => 'differential-inline-comment-edit-body',
	),
	$this->renderChildren());

	$edit = phutil_tag(
	'div',
	array(
	'class' => 'differential-inline-comment-edit-buttons',
	),
	array(
	- $formatting,
	$buttons,
	phutil_tag('div', array('style' => 'clear: both'), ''),
	));

	return javelin_tag(
	'div',
	array(
	'class' => 'differential-inline-comment-edit',
	'sigil' => 'differential-inline-comment',
	'meta' => array(
	'on_right' => $this->onRight,
	'number' => $this->number,
	'length' => $this->length,
	),
	),
	array(
	$title,
	$body,
	$edit,
	));
	}

	}
	diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
	index 77b3bfe19e..22550936cf 100644
	--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
	+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
	@@ -1,248 +1,245 @@
	<?php

	abstract class PhabricatorInlineCommentController
	extends PhabricatorController {

	abstract protected function createComment();
	abstract protected function loadComment($id);
	abstract protected function loadCommentForEdit($id);

	private $changesetID;
	private $isNewFile;
	private $isOnRight;
	private $lineNumber;
	private $lineLength;
	private $commentText;
	private $operation;
	private $commentID;

	public function getCommentID() {
	return $this->commentID;
	}

	public function getOperation() {
	return $this->operation;
	}

	public function getCommentText() {
	return $this->commentText;
	}

	public function getLineLength() {
	return $this->lineLength;
	}

	public function getLineNumber() {
	return $this->lineNumber;
	}

	public function getIsOnRight() {
	return $this->isOnRight;
	}

	public function getChangesetID() {
	return $this->changesetID;
	}

	public function getIsNewFile() {
	return $this->isNewFile;
	}


	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$this->readRequestParameters();

	switch ($this->getOperation()) {
	case 'delete':
	$inline = $this->loadCommentForEdit($this->getCommentID());

	if ($request->isFormPost()) {
	$inline->delete();
	return $this->buildEmptyResponse();
	}

	$dialog = new AphrontDialogView();
	$dialog->setUser($user);
	$dialog->setSubmitURI($request->getRequestURI());

	$dialog->setTitle('Really delete this comment?');
	$dialog->addHiddenInput('id', $this->getCommentID());
	$dialog->addHiddenInput('op', 'delete');
	$dialog->appendChild(
	phutil_tag('p', array(), pht('Delete this inline comment?')));

	$dialog->addCancelButton('#');
	$dialog->addSubmitButton('Delete');

	return id(new AphrontDialogResponse())->setDialog($dialog);
	case 'edit':
	$inline = $this->loadCommentForEdit($this->getCommentID());

	$text = $this->getCommentText();

	if ($request->isFormPost()) {
	if (strlen($text)) {
	$inline->setContent($text);
	$inline->save();
	return $this->buildRenderedCommentResponse(
	$inline,
	$this->getIsOnRight());
	} else {
	$inline->delete();
	return $this->buildEmptyResponse();
	}
	}

	$edit_dialog = $this->buildEditDialog();
	$edit_dialog->setTitle('Edit Inline Comment');

	$edit_dialog->addHiddenInput('id', $this->getCommentID());
	$edit_dialog->addHiddenInput('op', 'edit');

	$edit_dialog->appendChild(
	$this->renderTextArea(
	nonempty($text, $inline->getContent())));

	return id(new AphrontAjaxResponse())
	->setContent($edit_dialog->render());
	case 'create':

	$text = $this->getCommentText();

	if (!$request->isFormPost() \|\| !strlen($text)) {
	return $this->buildEmptyResponse();
	}

	$inline = $this->createComment()
	->setChangesetID($this->getChangesetID())
	->setAuthorPHID($user->getPHID())
	->setLineNumber($this->getLineNumber())
	->setLineLength($this->getLineLength())
	->setIsNewFile($this->getIsNewFile())
	->setContent($text)
	->save();

	return $this->buildRenderedCommentResponse(
	$inline,
	$this->getIsOnRight());
	case 'reply':
	default:
	$edit_dialog = $this->buildEditDialog();

	if ($this->getOperation() == 'reply') {
	$inline = $this->loadComment($this->getCommentID());

	$edit_dialog->setTitle('Reply to Inline Comment');
	$changeset = $inline->getChangesetID();
	$is_new = $inline->getIsNewFile();
	$number = $inline->getLineNumber();
	$length = $inline->getLineLength();
	} else {
	$edit_dialog->setTitle('New Inline Comment');
	$changeset = $this->getChangesetID();
	$is_new = $this->getIsNewFile();
	$number = $this->getLineNumber();
	$length = $this->getLineLength();
	}

	$edit_dialog->addHiddenInput('op', 'create');
	$edit_dialog->addHiddenInput('changeset', $changeset);
	$edit_dialog->addHiddenInput('is_new', $is_new);
	$edit_dialog->addHiddenInput('number', $number);
	$edit_dialog->addHiddenInput('length', $length);

	$text_area = $this->renderTextArea($this->getCommentText());
	$edit_dialog->appendChild($text_area);

	return id(new AphrontAjaxResponse())
	->setContent($edit_dialog->render());
	}
	}

	private function readRequestParameters() {
	$request = $this->getRequest();

	// 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 = $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');
	}

	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());

	return $edit_dialog;
	}

	private function buildEmptyResponse() {
	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	'markup' => '',
	));
	}

	private function buildRenderedCommentResponse(
	PhabricatorInlineCommentInterface $inline,
	$on_right) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);
	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	$engine->process();

	$phids = array($user->getPHID());

	$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);

	return id(new AphrontAjaxResponse())
	->setContent(
	array(
	'inlineCommentID' => $inline->getID(),
	'markup' => $view->render(),
	));
	}

	private function renderTextArea($text) {
	- return javelin_tag(
	- 'textarea',
	- array(
	- 'class' => 'differential-inline-comment-edit-textarea',
	- 'sigil' => 'differential-inline-comment-edit-textarea',
	- 'name' => 'text',
	- ),
	- $text);
	+ return id(new PhabricatorRemarkupControl())
	+ ->setUser($this->getRequest()->getUser())
	+ ->setSigil('differential-inline-comment-edit-textarea')
	+ ->setName('text')
	+ ->setValue($text);
	}

	}
	diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
	index a71c72cc9f..902d3ae16e 100644
	--- a/webroot/rsrc/css/application/differential/changeset-view.css
	+++ b/webroot/rsrc/css/application/differential/changeset-view.css
	@@ -1,454 +1,453 @@
	/**
	* @provides differential-changeset-view-css
	*/

	.differential-changeset {
	position: relative;
	margin: 0;
	padding-top: 32px;
	overflow-x: auto;
	}

	.differential-diff {
	background: #fff;
	width: 100%;
	border-top: 1px solid {$lightblueborder};
	border-bottom: 1px solid {$lightblueborder};
	}

	.differential-diff td {
	min-width: 320px;
	/*
	Disable ligatures in Firefox. Firefox 3 has fancypants ligature support, but
	it gets applied to monospaced fonts, which sucks because it means that the
	"fi" ligature only takes up one character, e.g. It's probably the font's
	fault that it even specifies ligatures (seriously, what the hell?) but
	that's hard to fix and this is "easy" to "fix": custom letter spacing
	disables ligatures, as long as it's at least 0.008333-repeating pixels of
	custom letter spacing. I have no idea where this number comes from, but note
	that .83333.. = 5/6. -epriestley
	*/
	letter-spacing: 0.0083334px;
	vertical-align: top;
	white-space: pre-wrap;
	padding: 0 8px 1px;
	line-height: 16px;
	}

	.differential-diff th {
	text-align: right;
	padding: 2px 6px 0px 0px;
	width: 4%;
	min-width: 45px;
	max-width: 4%;
	vertical-align: top;
	background: {$lightbluebackground};
	color: {$bluetext};
	cursor: pointer;
	border-right: 1px solid {$thinblueborder};
	font-size: 11px;
	overflow: hidden;

	-moz-user-select: -moz-none;
	-khtml-user-select: none;
	-webkit-user-select: none;
	-ms-user-select: none;
	user-select: none;
	}
	.differential-diff td.left {
	width: 45%;
	}

	.differential-diff td.right,
	.differential-diff td.right1 {
	width: 43.5%;
	}

	.differential-diff td.right2 {
	width: 44.5%;
	}
	.differential-diff td.right3 {
	width: 45%;
	}

	.differential-changeset-immutable .differential-diff th {
	cursor: auto;
	}

	.differential-diff td.old {
	background: #ffd0d0;
	}

	.differential-diff td.new {
	background: #d0ffd0;
	}

	.differential-diff td.old-rebase {
	background: #ffeeee;
	}

	.differential-diff td.new-rebase {
	background: #eeffee;
	}

	.differential-diff td.old-full,
	.differential-diff td.old span.bright {
	background: #ffaaaa;
	}

	.differential-diff td.new-full,
	.differential-diff td.new span.bright {
	background: #aaffaa;
	}

	.differential-diff td.copy {
	min-width: 0.5%;
	width: 0.5%;
	padding: 0;
	}

	.differential-diff td.new-copy,
	.differential-diff td.new-copy span.bright {
	background: {$lightyellow};
	}

	.differential-diff td.new-move,
	.differential-diff td.new-move span.bright {
	background: {$yellow};
	}

	.differential-diff td.comment {
	background: #dddddd;
	}

	.differential-diff td.cov {
	min-width: 1%;
	width: 1%;
	padding: 0;
	}

	td.cov-U {
	background: #dd8866;
	}

	td.cov-C {
	background: #66bbff;
	}

	td.cov-N {
	background: #ddeeff;
	}

	td.cov-X {
	background: #aa00aa;
	}

	.differential-diff td.source-cov-C,
	.differential-diff td.source-cov-C span.bright {
	background: #cceeff;
	}

	.differential-diff td.source-cov-U,
	.differential-diff td.source-cov-U span.bright {
	background: #ffbb99;
	}

	.differential-diff td.source-cov-N,
	.differential-diff td.source-cov-N span.bright {
	background: #f3f6ff;
	}



	.differential-diff td.show-more,
	.differential-diff th.show-context-line,
	.differential-diff td.show-context,
	.differential-diff td.differential-shield {
	background: {$lightbluebackground};
	padding: 12px 0;
	border-top: 1px solid {$thinblueborder};
	border-bottom: 1px solid {$thinblueborder};
	}

	.differential-diff td.show-more,
	.differential-diff td.differential-shield {
	font-family: "Helvetica Neue", "Arial", sans-serif;
	font-size: 12px;
	white-space: normal;
	}

	.differential-diff td.show-more {
	text-align: center;
	color: {$bluetext};
	}

	.differential-diff th.show-context-line {
	padding-right: 6px;
	}

	.differential-diff td.show-context {
	padding-left: 14px;
	}

	.differential-diff td.differential-shield {
	text-align: center;
	}

	.differential-diff td.differential-shield a {
	font-weight: bold;
	}

	.differential-diff .differential-image-diff {
	background-image: url(/rsrc/image/checker_light.png);
	}

	.differential-diff .differential-image-diff:hover {
	background-image: url(/rsrc/image/checker_dark.png);
	}

	.differential-meta-notice {
	border-top: 1px solid {$yellow};
	border-bottom: 1px solid {$yellow};
	background-color: {$lightyellow};
	padding: 12px;
	}

	.differential-meta-notice + .differential-diff {
	border-top: none;
	}

	.differential-changeset h1 {
	font-size: 15px;
	padding: 2px 0 12px 12px;
	}

	.differential-reticle {
	background: {$lightyellow};
	border: 1px solid {$yellow};
	position: absolute;
	opacity: 0.5;
	top: 0px;
	left: 0px;
	}

	.differential-inline-comment,
	.differential-inline-comment-edit {
	background: #ffffee;
	border: 1px solid #ccccaa;
	font-family: "Helvetica Neue", "Arial", sans-serif;
	font-size: 12px;
	margin: 6px 0px;
	padding: 8px 10px;
	width: 100%;
	-moz-box-sizing: border-box;
	-webkit-box-sizing: border-box;
	overflow: hidden;
	white-space: normal;
	}

	.differential-inline-comment-unsaved-draft {
	background: #f1f1f1;
	border: 1px dashed {$greytext};
	}

	.differential-inline-comment-head {
	font-weight: bold;
	color: #333333;
	border-bottom: 1px solid rgba(204,204,170,0.37);
	padding-bottom: 4px;
	margin-bottom: 8px;
	}

	.differential-inline-comment-unsaved-draft .differential-inline-comment-head {
	border-bottom: 1px solid #aaaaaa;
	}

	.differential-inline-comment-synthetic {
	background: {$lightblue};
	border: 1px solid {$blue};
	}

	.differential-inline-comment-synthetic .differential-inline-comment-head {
	border-bottom: 1px solid {$blueborder};
	}


	.differential-inline-comment-links,
	.differential-inline-comment-line {
	font-weight: normal;
	font-style: italic;
	color: {$greytext};
	float: right;
	white-space: nowrap;
	}

	.differential-inline-comment-links {
	margin-left: 8px;
	font-style: normal;
	}

	-
	-.differential-inline-comment-edit-textarea {
	+.differential-inline-comment-edit-body .aphront-form-input {
	+ margin: 0;
	width: 100%;
	- height: 12em;
	}

	.differential-changeset-buttons {
	float: right;
	margin-right: 16px;
	}

	.differential-changeset-buttons a.button {
	margin-left: 8px;
	}

	.differential-property-table {
	width: auto;
	margin: 12px auto;
	background: #e3e3e3;
	}

	.differential-property-table th {
	text-align: right;
	width: 10em;
	font-weight: bold;
	color: {$greytext};
	white-space: nowrap;
	padding: 4px 8px;
	border-right: 1px solid {$greytext};
	}

	.differential-property-table td {
	padding: 4px 8px;
	width: 35em;
	}

	.differential-property-table td em {
	color: {$lightgreytext};
	}

	.differential-property-table tr.property-table-header th,
	.differential-property-table tr.property-table-header td {
	text-align: center;
	font-weight: bold;
	border-bottom: 1px solid {$greytext};
	}

	.differential-property-table td.oval {
	background: #ffd0d0;
	}

	.differential-property-table td.nval {
	background: #d0ffd0;
	}

	.differential-property-table tr.property-table-header td.oval {
	background: #ffaaaa;
	}

	.differential-property-table tr.property-table-header td.nval {
	background: #aaffaa;
	}

	.differential-inline-undo {
	padding: 4px;
	text-align: center;
	background: #ffeeaa;
	margin: 3px 0 1px;
	font: 12px;
	color: 444444;
	}

	.differential-inline-undo a {
	font-weight: bold;
	}

	.differential-inline-comment-edit {
	padding: 10px;
	}

	.differential-inline-comment-edit-buttons {
	padding: 4px 0 0 0;
	}

	.differential-inline-comment-edit-buttons button {
	float: right;
	margin-left: 6px;
	}

	.differential-inline-comment-edit-title {
	font-weight: bold;
	color: #333333;
	padding-bottom: 2px;
	margin-bottom: 6px;
	}

	/* When the inline editor is active, disable all the other inline comment links
	on the page ("Edit", "Reply", "Delete", etc). The goal here is to prevent
	issues where you open up multiple editors and run into problems with
	assumptions about modalness. They are disabled explicitly by the JS, but
	render them in a disabled state as well.
	*/
	.inline-editor-active .differential-inline-comment-links a,
	.inline-editor-active .differential-inline-comment-links a:hover,
	.inline-editor-active .differential-inline-comment-links a:active {
	color: {$lightgreytext};
	cursor: normal;
	text-decoration: none;
	}

	/* Create a wide band of color behind the inline edit interface so it is easy
	to find by skimming the page while scrolling.
	*/
	tr.inline-comment-splint {
	background: #f9f1d5;
	}

	tr.differential-inline-hidden {
	display: none;
	}

	tr.differential-inline-loading {
	opacity: 0.5;
	}


	/* In the document, the anchor is positioned inside the inline comment, but
	this makes the browser jump into the comment so the top isn't visible.
	Instead, artificially position it a bit above the comment so we'll jump a
	bit before the comment. This allows us to see the entire comment (and
	generally the commented-on lines, at least in the case of one or two-line
	comments) after the jump.
	*/
	.differential-inline-comment-anchor {
	position: absolute;
	display: block;
	margin-top: -72px;
	}

	.differential-loading {
	border-top: 1px solid {$yellow};
	border-bottom: 1px solid {$yellow};
	background-color: {$lightyellow};
	padding: 12px;
	text-align: center;
	}

	.differential-collapse-undo {
	background: #FFE;
	color: #000;
	padding: 1em 0em;
	border: 1px solid #CCA;
	text-align: center;
	background-color: #FFE;
	}

	.differential-collapse-undo a {
	font-weight: bold;
	}

	.differential-file-icon-header .phui-icon-view {
	display: inline-block;
	margin: 0 4px 2px 0;
	vertical-align: middle;
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Mar 17, 12:47 AM (1 d, 7 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 963905
Default Alt Text: (22 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions