Skip to content

Commit 56a122c

Browse files
author
Rodrigo Fernandes
committed
Merge pull request #7 from rtfpessoa/multiline-diff-blocks
Multiline diff blocks
2 parents 10b2c89 + 2b3c977 commit 56a122c

14 files changed

+1240
-531
lines changed

diff2html.js

Lines changed: 0 additions & 422 deletions
This file was deleted.

diff2html.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

diff2html.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

index.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,23 @@
77
<!--
88
Diff to HTML (template.html)
99
Author: rtfpessoa
10-
Date: Friday 29 August 2014
11-
Last Update: Sunday 2 February 2015
1210
-->
1311

1412
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
1513
<link rel="stylesheet" type="text/css" href="diff2html.css">
1614

17-
1815
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
1916

20-
<script type="text/javascript" src="jsdiff.js"></script>
21-
<script type="text/javascript" src="diff2html.js"></script>
17+
<script type="text/javascript" src="lib/diff.js"></script>
18+
<script type="text/javascript" src="lib/fakeRequire.js"></script>
19+
20+
<script type="text/javascript" src="src/utils.js"></script>
21+
<script type="text/javascript" src="src/diff-parser.js"></script>
22+
<script type="text/javascript" src="src/printer-utils.js"></script>
23+
<script type="text/javascript" src="src/side-by-side-printer.js"></script>
24+
<script type="text/javascript" src="src/line-by-line-printer.js"></script>
25+
<script type="text/javascript" src="src/html-printer.js"></script>
26+
<script type="text/javascript" src="src/diff2html.js"></script>
2227
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
2328
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
2429
<script>
@@ -181,7 +186,7 @@
181186
'-});\n';
182187

183188
$(document).ready(function () {
184-
var diff2Html = new Diff2Html();
189+
var diff2Html = Diff2Html;
185190
var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
186191

187192
var languages = diffJson.map(function (line) {

jsdiff.js

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)