Skip to content

Commit 8b9c247

Browse files
author
Rodrigo Fernandes
committed
Merge pull request #32 from rtfpessoa/fix-changes-headers
fix changes summary on files headers
2 parents 45e84c5 + 54b3915 commit 8b9c247

File tree

8 files changed

+1157
-524
lines changed

8 files changed

+1157
-524
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html",
3-
"version": "1.1.1",
3+
"version": "1.1.3",
44
"homepage": "http://rtfpessoa.github.io/diff2html/",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [

dist/diff2html.js

Lines changed: 1131 additions & 505 deletions
Large diffs are not rendered by default.

dist/diff2html.min.js

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"homepage": "http://rtfpessoa.github.io/diff2html/",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [
@@ -36,13 +36,17 @@
3636
},
3737
"preferGlobal": "true",
3838
"scripts": {
39-
"test": ""
39+
"release": "bash release.sh"
4040
},
4141
"main": "./src/diff2html.js",
4242
"dependencies": {
43-
"diff": "1.4.0"
43+
"diff": "2.2.*"
44+
},
45+
"devDependencies": {
46+
"webpack": "1.12.*",
47+
"uglifyjs": "2.4.*",
48+
"less": "2.5.*"
4449
},
45-
"devDependencies": {},
4650
"license": "MIT",
4751
"files": [
4852
"src"

release.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ echo "Cleaning previous versions ..."
1717
rm -rf ${OUTPUT_DIR}
1818
mkdir -p ${OUTPUT_DIR}
1919

20-
echo "Preparing dependencies ..."
21-
rm -rf node_modules
22-
npm install
23-
2420
echo "Generating js aggregation file in ${OUTPUT_JS_FILE}"
2521

2622
webpack ./src/diff2html.js ${OUTPUT_JS_FILE}

sample/index.html

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

12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
1313

1414
<!-- -->
1515
<link rel="stylesheet" type="text/css" href="../dist/diff2html.min.css">
1616
<script type="text/javascript" src="../dist/diff2html.min.js"></script>
1717
<!-- -->
1818

19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
20-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script>
19+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
20+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/languages/scala.min.js"></script>
2121

2222
<script>
2323
var lineDiffExample =

src/line-by-line-printer.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
2929
' <div class="d2h-file-header">\n' +
3030
' <div class="d2h-file-stats">\n' +
31-
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
32-
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
31+
' <span class="d2h-lines-added">' +
32+
' <span>+' + file.addedLines + '</span>\n' +
33+
' </span>\n' +
34+
' <span class="d2h-lines-deleted">' +
35+
' <span>-' + file.deletedLines + '</span>\n' +
36+
' </span>\n' +
3337
' </div>\n' +
3438
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
3539
' </div>\n' +

src/side-by-side-printer.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
2929
' <div class="d2h-file-header">\n' +
3030
' <div class="d2h-file-stats">\n' +
31-
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
32-
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
31+
' <span class="d2h-lines-added">' +
32+
' <span>+' + file.addedLines + '</span>\n' +
33+
' </span>\n' +
34+
' <span class="d2h-lines-deleted">' +
35+
' <span>-' + file.deletedLines + '</span>\n' +
36+
' </span>\n' +
3337
' </div>\n' +
3438
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
3539
' </div>\n' +

0 commit comments

Comments
 (0)