HomePhorge
Diffusion Phorge 68fa70eacbc8

Make images work in the unified diff view
68fa70eacbc8
Actions

Description

Make images work in the unified diff view

Summary: Ref T2009. Still a touch glitch-ish but essentially functional now.

Test Plan: Viewed image diffs in 1up and 2up views. Made inline comments on them.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T2009

Differential Revision: https://secure.phabricator.com/D12003

Details

Provenance
epriestleyAuthored on Mar 6 2015, 9:38 AM
themackabuPushed on Mar 25 2025, 8:07 PM
Parents
rPf9cb366f0071: Remove duplicate inline scaffold in 2up renderer
Branches
master
Tags
None

Event Timeline

Changes (3)

PathSize
src/
applications/
differential/
render/

rP68fa70eacbc8

View Options

src/applications/differential/render/DifferentialChangesetHTMLRenderer.php

Show First 20 Lines • Show All 569 Lines • ▼ Show 20 Lines if ($this->getNewChangesetID()) {
$right_prefix = implode('', $right_prefix); $right_prefix = implode('', $right_prefix);
} else { } else {
$right_prefix = null; $right_prefix = null;
} }
return array($left_prefix, $right_prefix); return array($left_prefix, $right_prefix);
} }
protected function renderImageStage(PhabricatorFile $file) {
return phutil_tag(
'div',
array(
'class' => 'differential-image-stage',
),
phutil_tag(
'img',
array(
'src' => $file->getBestURI(),
)));
}
} }
View Options

src/applications/differential/render/DifferentialChangesetOneUpRenderer.php

Show All 24 Linesfinal class DifferentialChangesetOneUpRenderer
} }
public function renderTextChange( public function renderTextChange(
$range_start, $range_start,
$range_len, $range_len,
$rows) { $rows) {
$primitives = $this->buildPrimitives($range_start, $range_len); $primitives = $this->buildPrimitives($range_start, $range_len);
return $this->renderPrimitives($primitives, $rows);
}
protected function renderPrimitives(array $primitives, $rows) {
list($left_prefix, $right_prefix) = $this->getLineIDPrefixes(); list($left_prefix, $right_prefix) = $this->getLineIDPrefixes();
$no_copy = phutil_tag('td', array('class' => 'copy')); $no_copy = phutil_tag('td', array('class' => 'copy'));
$no_coverage = null; $no_coverage = null;
$column_width = 4; $column_width = 4;
$out = array(); $out = array();
foreach ($primitives as $p) { foreach ($primitives as $p) {
$type = $p['type']; $type = $p['type'];
switch ($type) { switch ($type) {
case 'old': case 'old':
case 'new': case 'new':
$out[] = hsprintf('<tr>'); case 'old-file':
if ($type == 'old') { case 'new-file':
$is_old = ($type == 'old' || $type == 'old-file');
$cells = array();
if ($is_old) {
if ($p['htype']) { if ($p['htype']) {
$class = 'left old'; $class = 'left old';
} else { } else {
$class = 'left'; $class = 'left';
} }
if ($type == 'old-file') {
$class = "{$class} differential-old-image";
}
if ($left_prefix) { if ($left_prefix) {
$left_id = $left_prefix.$p['line']; $left_id = $left_prefix.$p['line'];
} else { } else {
$left_id = null; $left_id = null;
} }
$out[] = phutil_tag('th', array('id' => $left_id), $p['line']); $cells[] = phutil_tag('th', array('id' => $left_id), $p['line']);
$out[] = phutil_tag('th', array()); $cells[] = phutil_tag('th', array());
$out[] = $no_copy; $cells[] = $no_copy;
$out[] = phutil_tag('td', array('class' => $class), $p['render']); $cells[] = phutil_tag('td', array('class' => $class), $p['render']);
$out[] = $no_coverage; $cells[] = $no_coverage;
} else { } else {
if ($p['htype']) { if ($p['htype']) {
$class = 'right new'; $class = 'right new';
$out[] = phutil_tag('th', array()); $cells[] = phutil_tag('th', array());
} else { } else {
$class = 'right'; $class = 'right';
if ($left_prefix) { if ($left_prefix) {
$left_id = $left_prefix.$p['oline']; $left_id = $left_prefix.$p['oline'];
} else { } else {
$left_id = null; $left_id = null;
} }
$out[] = phutil_tag('th', array('id' => $left_id), $p['oline']); $cells[] = phutil_tag('th', array('id' => $left_id), $p['oline']);
} }
if ($type == 'new-file') {
$class = "{$class} differential-new-image";
}
if ($right_prefix) { if ($right_prefix) {
$right_id = $right_prefix.$p['line']; $right_id = $right_prefix.$p['line'];
} else { } else {
$right_id = null; $right_id = null;
} }
$out[] = phutil_tag('th', array('id' => $right_id), $p['line']); $cells[] = phutil_tag('th', array('id' => $right_id), $p['line']);
$out[] = $no_copy; $cells[] = $no_copy;
$out[] = phutil_tag('td', array('class' => $class), $p['render']); $cells[] = phutil_tag('td', array('class' => $class), $p['render']);
$out[] = $no_coverage; $cells[] = $no_coverage;
} }
$out[] = hsprintf('</tr>');
$out[] = phutil_tag('tr', array(), $cells);
break; break;
case 'inline': case 'inline':
$inline = $this->buildInlineComment( $inline = $this->buildInlineComment(
$p['comment'], $p['comment'],
$p['right']); $p['right']);
$out[] = $this->getRowScaffoldForInline($inline); $out[] = $this->getRowScaffoldForInline($inline);
break; break;
case 'no-context': case 'no-context':
Show All 31 Lines foreach ($primitives as $p) {
$out[] = hsprintf('<tr><th /><th /><td>%s</td></tr>', $type); $out[] = hsprintf('<tr><th /><th /><td>%s</td></tr>', $type);
break; break;
} }
} }
if ($out) { if ($out) {
return $this->wrapChangeInTable(phutil_implode_html('', $out)); return $this->wrapChangeInTable(phutil_implode_html('', $out));
} }
return null; return null;
} }
public function renderFileChange( public function renderFileChange(
$old_file = null, $old_file = null,
$new_file = null, $new_file = null,
$id = 0, $id = 0,
$vs = 0) { $vs = 0) {
throw new PhutilMethodNotImplementedException(); // TODO: This should eventually merge into the normal primitives pathway,
// but fake it for now and just share as much code as possible.
$primitives = array();
if ($old_file) {
$primitives[] = array(
'type' => 'old-file',
'htype' => ($new_file ? 'new-file' : null),
'file' => $old_file,
'line' => 1,
'render' => $this->renderImageStage($old_file),
);
}
if ($new_file) {
$primitives[] = array(
'type' => 'new-file',
'htype' => ($old_file ? 'old-file' : null),
'file' => $new_file,
'line' => 1,
'oline' => ($old_file ? 1 : null),
'render' => $this->renderImageStage($old_file),
);
}
// TODO: We'd like to share primitive code here, but buildPrimitives()
// currently chokes on changesets with no textual data.
foreach ($this->getOldComments() as $line => $group) {
foreach ($group as $comment) {
$primitives[] = array(
'type' => 'inline',
'comment' => $comment,
'right' => false,
);
}
}
foreach ($this->getNewComments() as $line => $group) {
foreach ($group as $comment) {
$primitives[] = array(
'type' => 'inline',
'comment' => $comment,
'right' => true,
);
}
}
$output = $this->renderPrimitives($primitives, 1);
return $this->renderChangesetTable($output);
} }
public function getRowScaffoldForInline(PHUIDiffInlineCommentView $view) { public function getRowScaffoldForInline(PHUIDiffInlineCommentView $view) {
return id(new PHUIDiffOneUpInlineCommentRowScaffold()) return id(new PHUIDiffOneUpInlineCommentRowScaffold())
->addInlineView($view); ->addInlineView($view);
} }
} }
View Options

src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Linesfinal class DifferentialChangesetTwoUpRenderer
} }
public function renderFileChange($old_file = null, public function renderFileChange($old_file = null,
$new_file = null, $new_file = null,
$id = 0, $id = 0,
$vs = 0) { $vs = 0) {
$old = null; $old = null;
if ($old_file) { if ($old_file) {
$old = phutil_tag( $old = $this->renderImageStage($old_file);
'div',
array(
'class' => 'differential-image-stage',
),
phutil_tag(
'img',
array(
'src' => $old_file->getBestURI(),
)));
} }
$new = null; $new = null;
if ($new_file) { if ($new_file) {
$new = phutil_tag( $new = $this->renderImageStage($new_file);
'div',
array(
'class' => 'differential-image-stage',
),
phutil_tag(
'img',
array(
'src' => $new_file->getBestURI(),
)));
} }
$html_old = array(); $html_old = array();
$html_new = array(); $html_new = array();
foreach ($this->getOldComments() as $on_line => $comment_group) { foreach ($this->getOldComments() as $on_line => $comment_group) {
foreach ($comment_group as $comment) { foreach ($comment_group as $comment) {
$inline = $this->buildInlineComment( $inline = $this->buildInlineComment(
$comment, $comment,
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines