Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15436960
D12024.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D12024.id.diff
View Options
diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
@@ -438,7 +438,7 @@
return id(new PHUIDiffInlineCommentDetailView())
->setInlineComment($comment)
- ->setOnRight($on_right)
+ ->setIsOnRight($on_right)
->setHandles($this->getHandles())
->setMarkupEngine($this->getMarkupEngine())
->setEditable($edit)
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
@@ -236,7 +236,7 @@
$edit_dialog = id(new PHUIDiffInlineCommentEditView())
->setUser($user)
->setSubmitURI($request->getRequestURI())
- ->setOnRight($this->getIsOnRight())
+ ->setIsOnRight($this->getIsOnRight())
->setIsNewFile($this->getIsNewFile())
->setNumber($this->getLineNumber())
->setLength($this->getLineLength())
@@ -275,7 +275,7 @@
$view = id(new PHUIDiffInlineCommentDetailView())
->setInlineComment($inline)
- ->setOnRight($on_right)
+ ->setIsOnRight($on_right)
->setMarkupEngine($engine)
->setHandles($handles)
->setEditable(true);
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -4,7 +4,6 @@
extends PHUIDiffInlineCommentView {
private $inlineComment;
- private $onRight;
private $handles;
private $markupEngine;
private $editable;
@@ -12,20 +11,11 @@
private $allowReply;
private $renderer;
- public function getIsOnRight() {
- return $this->onRight;
- }
-
public function setInlineComment(PhabricatorInlineCommentInterface $comment) {
$this->inlineComment = $comment;
return $this;
}
- public function setOnRight($on_right) {
- $this->onRight = $on_right;
- return $this;
- }
-
public function setHandles(array $handles) {
assert_instances_of($handles, 'PhabricatorObjectHandle');
$this->handles = $handles;
@@ -81,7 +71,7 @@
'number' => $inline->getLineNumber(),
'length' => $inline->getLineLength(),
'isNewFile' => (bool)$inline->getIsNewFile(),
- 'on_right' => $this->onRight,
+ 'on_right' => $this->getIsOnRight(),
'original' => $inline->getContent(),
'replyToCommentPHID' => $inline->getReplyToCommentPHID(),
);
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
@@ -6,7 +6,6 @@
private $inputs = array();
private $uri;
private $title;
- private $onRight;
private $number;
private $length;
private $renderer;
@@ -23,10 +22,6 @@
return $this->isNewFile;
}
- public function getIsOnRight() {
- return $this->onRight;
- }
-
public function setRenderer($renderer) {
$this->renderer = $renderer;
return $this;
@@ -69,11 +64,6 @@
return $this->changesetID;
}
- public function setOnRight($on_right) {
- $this->onRight = $on_right;
- return $this;
- }
-
public function setNumber($number) {
$this->number = $number;
return $this;
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php
@@ -9,17 +9,6 @@
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',
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
@@ -2,6 +2,15 @@
abstract class PHUIDiffInlineCommentView extends AphrontView {
- abstract public function getIsOnRight();
+ private $isOnRight;
+
+ public function getIsOnRight() {
+ return $this->isOnRight;
+ }
+
+ public function setIsOnRight($on_right) {
+ $this->isOnRight = $on_right;
+ return $this;
+ }
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Mar 26, 4:50 PM (4 w, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7592172
Default Alt Text
D12024.id.diff (4 KB)
Attached To
Mode
D12024: Reduce code duplication in inline right/left side tracking
Attached
Detach File
Event Timeline
Log In to Comment