Skip to content

Commit 5ee366a

Browse files
committed
update to highlightjs 8.6
1 parent 029efa4 commit 5ee366a

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

sample/index.html

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Author: rtfpessoa
1010
-->
1111

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">
1313

1414
<!--
1515
<link rel="stylesheet" type="text/css" href="../css/diff2html.css">
@@ -30,11 +30,12 @@
3030
<!-- -->
3131

3232
<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>
3535

3636
<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' +
3839
'index facdd41..b627fe8 100644\n' +
3940
'--- a/src/attributes/attr.js\n' +
4041
'+++ b/src/attributes/attr.js\n' +
@@ -74,7 +75,7 @@
7475
'-], function( jQuery, rnotwhite, strundefined, dataPriv ) {\n' +
7576
'+], function( jQuery, rnotwhite, dataPriv ) {\n' +
7677
' \n' +
77-
' var rclass = /[\t\r\n\f]/g;\n' +
78+
' var rclass = /[\\t\\r\\n\\f]/g;\n' +
7879
' \n' +
7980
'@@ -128,7 +127,7 @@ jQuery.fn.extend({\n' +
8081
' }\n' +
@@ -221,25 +222,21 @@
221222
var diff2Html = Diff2Html;
222223
var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
223224

224-
var languages = diffJson.map(function (line) {
225+
var allFileLanguages = diffJson.map(function (line) {
225226
return line.language;
226227
});
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;
229230
});
230-
hljs.configure({languages: uniqueLanguages});
231+
hljs.configure({languages: distinctLanguages});
231232

232233
$("#line-by-line").html(diff2Html.getPrettyHtmlFromJson(diffJson));
234+
$("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson));
235+
233236
var code = $(".d2h-code-line-ctn");
234237
code.map(function (i, line) {
235238
hljs.highlightBlock(line);
236239
});
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-
});
243240
});
244241
</script>
245242

0 commit comments

Comments
 (0)