1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 21:02:41 +01:00

Disable full screen mode for inline comments

Summary:
Full screen is a little foobar so disabling it for inline comments
Fixes T5272

Test Plan:
View inline comment after change, make sure full screen option
has gone.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Maniphest Tasks: T5272

Differential Revision: https://secure.phabricator.com/D9579
This commit is contained in:
Gareth Evans 2014-06-16 13:05:08 -07:00 committed by epriestley
parent 5aae1ee034
commit baa998faa4
2 changed files with 19 additions and 9 deletions

View file

@ -243,7 +243,8 @@ abstract class PhabricatorInlineCommentController
->setUser($this->getRequest()->getUser()) ->setUser($this->getRequest()->getUser())
->setSigil('differential-inline-comment-edit-textarea') ->setSigil('differential-inline-comment-edit-textarea')
->setName('text') ->setName('text')
->setValue($text); ->setValue($text)
->setDisableFullScreen(true);
} }
} }

View file

@ -3,11 +3,18 @@
final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl { final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl {
private $disableMacro = false; private $disableMacro = false;
private $disableFullScreen = false;
public function setDisableMacros($disable) { public function setDisableMacros($disable) {
$this->disableMacro = $disable; $this->disableMacro = $disable;
return $this; return $this;
} }
public function setDisableFullScreen($disable) {
$this->disableFullScreen = $disable;
return $this;
}
protected function renderInput() { protected function renderInput() {
$id = $this->getID(); $id = $this->getID();
if (!$id) { if (!$id) {
@ -90,15 +97,17 @@ final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl {
'href' => PhabricatorEnv::getDoclink('Remarkup Reference'), 'href' => PhabricatorEnv::getDoclink('Remarkup Reference'),
); );
$actions[] = array( if (!$this->disableFullScreen) {
'spacer' => true, $actions[] = array(
'align' => 'right', 'spacer' => true,
); 'align' => 'right',
);
$actions['fa-arrows-alt'] = array( $actions['fa-arrows-alt'] = array(
'tip' => pht('Fullscreen Mode'), 'tip' => pht('Fullscreen Mode'),
'align' => 'right', 'align' => 'right',
); );
}
$buttons = array(); $buttons = array();
foreach ($actions as $action => $spec) { foreach ($actions as $action => $spec) {