Skip to content

Digi live #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 2, 2020
Merged

Digi live #26

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0e230e3
Code Optimization, cleanup, refactoring and commenting.
DigiLive Jan 28, 2020
60cb97f
Merge remote-tracking branch 'origin/development' into DigiLive
DigiLive Jan 28, 2020
c29a8aa
Code Optimization, cleanup, refactoring and commenting.
DigiLive Jan 29, 2020
b5e2cb0
Merge branch 'development' into DigiLive
DigiLive Jan 30, 2020
cd653c2
Change example texts.
DigiLive Jan 30, 2020
33ba153
Merge branch 'NewExampleTexts' into DigiLive
DigiLive Jan 30, 2020
5d03eae
Fix PHPMD Violation.
DigiLive Jan 30, 2020
98d993e
Add trimEqual option.
DigiLive Feb 1, 2020
54892e1
Code fixes, optimization, cleanup, refactoring and commenting.
DigiLive Feb 3, 2020
0b3dea0
Line exceeds 120 characters; contains 121
JBlond Feb 3, 2020
c11b4ba
Add contributor to author lists.
DigiLive Feb 5, 2020
5123f6b
Merge remote-tracking branch 'origin/DigiLive' into DigiLive
DigiLive Feb 5, 2020
4c2cbb7
Add contributor to author lists.
DigiLive Feb 5, 2020
3d33000
Remove formatting of "collapsed block" indicator.
DigiLive Feb 5, 2020
fbda2bd
Fix expected value for HtmlRendererTest::testUnified()
DigiLive Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove formatting of "collapsed block" indicator.
  • Loading branch information
@DigiLive
DigiLive committed Feb 5, 2020
commit 3d33000babaafe5e4d04a8d00d00f8d2bc908935
8 changes: 3 additions & 5 deletions lib/jblond/Diff/Renderer/Html/Unified.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ public function render(): string
* Render the unified diff-view as html.
*
* Since this class extends the "HtmlArray" class which in turn extends "RendererAbstract" class, this method needs
* to match the signature of RendererAbstract::renderHTML. However the second parameter isn't used and can be
* to match the signature of RendererAbstract::renderHTML(). However the second parameter isn't used and can be
* omitted.
*
* @param array $changes Contains the op-codes about the differences between "old and "new".
* @param null $object Unused.
*
* @return string HTML code containing the unified differences.
* @return string HTML code containing the unified differences.
*/
public function renderHtml($changes, $object = null): string
{
Expand All @@ -56,9 +56,7 @@ public function renderHtml($changes, $object = null): string
// If this is a separate block, we're condensing code to output …,
// indicating a significant portion of the code has been collapsed as it did not change.
$html .= <<<HTML
<span class="Skipped" title="Equal lines collapsed!">
<strong>&hellip;</strong>
</span>
<span class="Skipped" title="Equal lines collapsed!">&hellip;</span>
HTML;
}

Expand Down