luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to highlightjs 8.6

Browse source
This commit is contained in:
Rodrigo Fernandes 2015-07-18 23:38:17 +01:00
parent 029efa4d0a
commit 5ee366a01e
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sample/index.html
View file

@ -9,7 +9,7 @@
Author: rtfpessoa Author: rtfpessoa
--> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/github.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
<!-- <!--
<link rel="stylesheet" type="text/css" href="../css/diff2html.css"> <link rel="stylesheet" type="text/css" href="../css/diff2html.css">
@ -30,11 +30,12 @@
<!-- --> <!-- -->
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script> <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script>
<script> <script>
var lineDiffExample = 'diff --git a/src/attributes/attr.js b/src/attributes/attr.js\n' + var lineDiffExample =
'diff --git a/src/attributes/attr.js b/src/attributes/attr.js\n' +
'index facdd41..b627fe8 100644\n' + 'index facdd41..b627fe8 100644\n' +
'--- a/src/attributes/attr.js\n' + '--- a/src/attributes/attr.js\n' +
'+++ b/src/attributes/attr.js\n' + '+++ b/src/attributes/attr.js\n' +
@ -74,7 +75,7 @@
'-], function( jQuery, rnotwhite, strundefined, dataPriv ) {\n' + '-], function( jQuery, rnotwhite, strundefined, dataPriv ) {\n' +
'+], function( jQuery, rnotwhite, dataPriv ) {\n' + '+], function( jQuery, rnotwhite, dataPriv ) {\n' +
' \n' + ' \n' +
' var rclass = /[\t\r\n\f]/g;\n' + ' var rclass = /[\\t\\r\\n\\f]/g;\n' +
' \n' + ' \n' +
'@@ -128,7 +127,7 @@ jQuery.fn.extend({\n' + '@@ -128,7 +127,7 @@ jQuery.fn.extend({\n' +
' }\n' + ' }\n' +
@ -221,25 +222,21 @@
var diff2Html = Diff2Html; var diff2Html = Diff2Html;
var diffJson = diff2Html.getJsonFromDiff(lineDiffExample); var diffJson = diff2Html.getJsonFromDiff(lineDiffExample);
var languages = diffJson.map(function (line) { var allFileLanguages = diffJson.map(function (line) {
return line.language; return line.language;
}); });
var uniqueLanguages = languages.filter(function (v, i) { var distinctLanguages = allFileLanguages.filter(function (v, i) {
return languages.indexOf(v) == i; return allFileLanguages.indexOf(v) == i;
}); });
hljs.configure({languages: uniqueLanguages}); hljs.configure({languages: distinctLanguages});
$("#line-by-line").html(diff2Html.getPrettyHtmlFromJson(diffJson)); $("#line-by-line").html(diff2Html.getPrettyHtmlFromJson(diffJson));
$("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson));
var code = $(".d2h-code-line-ctn"); var code = $(".d2h-code-line-ctn");
code.map(function (i, line) { code.map(function (i, line) {
hljs.highlightBlock(line); hljs.highlightBlock(line);
}); });
$("#side-by-side").html(diff2Html.getPrettySideBySideHtmlFromJson(diffJson));
var codeSide = $(".d2h-code-line-ctn");
codeSide.map(function (i, line) {
hljs.highlightBlock(line);
});
}); });
</script> </script>