|
9 | 9 | Author: rtfpessoa
|
10 | 10 | -->
|
11 | 11 |
|
12 |
| - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/github.min.css"> |
| 12 | + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css"> |
13 | 13 |
|
14 | 14 | <!--
|
15 | 15 | <link rel="stylesheet" type="text/css" href="../css/diff2html.css">
|
|
30 | 30 | <!-- -->
|
31 | 31 |
|
32 | 32 | <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
|
33 |
| - <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script> |
34 |
| - <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script> |
| 33 | + <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script> |
| 34 | + <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script> |
35 | 35 |
|
36 | 36 | <script>
|
37 |
| - var lineDiffExample = 'diff --git a/src/attributes/attr.js b/src/attributes/attr.js\n' + |
| 37 | + var lineDiffExample = |
| 38 | + 'diff --git a/src/attributes/attr.js b/src/attributes/attr.js\n' + |
38 | 39 | 'index facdd41..b627fe8 100644\n' +
|
39 | 40 | '--- a/src/attributes/attr.js\n' +
|
40 | 41 | '+++ b/src/attributes/attr.js\n' +
|
|
74 | 75 | '-], function( jQuery, rnotwhite, strundefined, dataPriv ) {\n' +
|
75 | 76 | '+], function( jQuery, rnotwhite, dataPriv ) {\n' +
|
76 | 77 | ' \n' +
|
77 |
| - ' var rclass = /[\t\r\n\f]/g;\n' + |
| 78 | + ' var rclass = /[\\t\\r\\n\\f]/g;\n' + |
78 | 79 | ' \n' +
|
79 | 80 | '@@ -128,7 +127,7 @@ jQuery.fn.extend({\n' +
|
80 | 81 | ' }\n' +
|
|
221 | 222 | var diff2Html = Diff2Html;
|
222 | 223 | var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
|
223 | 224 |
|
224 |
| - var languages = diffJson.map(function (line) { |
| 225 | + var allFileLanguages = diffJson.map(function (line) { |
225 | 226 | return line.language;
|
226 | 227 | });
|
227 |
| - var uniqueLanguages = languages.filter(function (v, i) { |
228 |
| - return languages.indexOf(v) == i; |
| 228 | + var distinctLanguages = allFileLanguages.filter(function (v, i) { |
| 229 | + return allFileLanguages.indexOf(v) == i; |
229 | 230 | });
|
230 |
| - hljs.configure({languages: uniqueLanguages}); |
| 231 | + hljs.configure({languages: distinctLanguages}); |
231 | 232 |
|
232 | 233 | $("#line-by-line").html(diff2Html.getPrettyHtmlFromJson(diffJson));
|
| 234 | + $("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson)); |
| 235 | + |
233 | 236 | var code = $(".d2h-code-line-ctn");
|
234 | 237 | code.map(function (i, line) {
|
235 | 238 | hljs.highlightBlock(line);
|
236 | 239 | });
|
237 |
| - |
238 |
| - $("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson)); |
239 |
| - var codeSide = $(".d2h-code-line-ctn"); |
240 |
| - codeSide.map(function (i, line) { |
241 |
| - hljs.highlightBlock(line); |
242 |
| - }); |
243 | 240 | });
|
244 | 241 | </script>
|
245 | 242 |
|
|
0 commit comments