Page MenuHomePhabricator
Files F15458895

D12013.diff
No OneTemporary
Actions

D12013.diff
View Options

diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -72,10 +72,12 @@
$whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
- $parser = new DifferentialChangesetParser();
- $parser->setUser($user);
- $parser->setChangeset($changeset);
- $parser->setRenderingReference("{$l},{$r}");
+ $parser = id(new DifferentialChangesetParser())
+ ->setUser($user)
+ ->setChangeset($changeset)
+ ->setRenderingReference("{$l},{$r}");
+
+ $parser->readParametersFromRequest($request);
$parser->setWhitespaceMode($whitespace_mode);
$engine = new PhabricatorMarkupEngine();
@@ -87,28 +89,25 @@
list($range_s, $range_e, $mask) =
DifferentialChangesetParser::parseRangeSpecification($spec);
- $output = $parser->render($range_s, $range_e, $mask);
+ $parser->setRange($range_s, $range_e);
+ $parser->setMask($mask);
if ($request->isAjax()) {
return id(new PhabricatorChangesetResponse())
- ->setRenderedChangeset($output);
+ ->setRenderedChangeset($parser->renderChangeset());
}
- $output = id(new DifferentialChangesetDetailView())
+ $changes = id(new DifferentialChangesetListView())
->setUser($this->getViewer())
- ->setChangeset($changeset)
- ->setRenderingRef("{$l},{$r}")
+ ->setChangesets(array($changeset))
+ ->setVisibleChangesets(array($changeset))
+ ->setRenderingReferences(array("{$l},{$r}"))
->setRenderURI('/phriction/diff/'.$document->getID().'/')
- ->appendChild($output);
+ ->setTitle(pht('Changes'))
+ ->setParser($parser);
- require_celerity_resource('differential-changeset-view-css');
- require_celerity_resource('syntax-highlighting-css');
require_celerity_resource('phriction-document-css');
- Javelin::initBehavior('differential-populate', array(
- 'changesetViewIDs' => array($output->getID()),
- ));
-
$slug = $document->getSlug();
$revert_l = $this->renderRevertButton($content_l, $current);
@@ -198,13 +197,11 @@
'<table class="phriction-revert-table">'.
'<tr><td>%s</td><td>%s</td>'.
'</table>'.
- '%s'.
'</div>',
$comparison_table->render(),
$navigation_table,
$revert_l,
- $revert_r,
- $output);
+ $revert_r);
$object_box = id(new PHUIObjectBoxView())
@@ -215,6 +212,7 @@
array(
$crumbs,
$object_box,
+ $changes,
),
array(
'title' => pht('Document History'),

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 1, 8:03 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7580777
Default Alt Text
D12013.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility