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

Merge pull request #32 from rtfpessoa/fix-changes-headers

Browse source 
fix changes summary on files headers
This commit is contained in:
Rodrigo Fernandes 2015-10-31 21:58:45 +00:00
commit 8b9c2473b2
8 changed files with 1240 additions and 607 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "1.1.1", "version": "1.1.3",
"homepage": "http://rtfpessoa.github.io/diff2html/", "homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [

1802
dist/diff2html.js vendored
View file

File diff suppressed because one or more lines are too long

5
dist/diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long

12
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "1.1.2", "version": "1.1.3",
"homepage": "http://rtfpessoa.github.io/diff2html/", "homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML", "description": "Fast Diff to colorized HTML",
"keywords": [ "keywords": [
@ -36,13 +36,17 @@
}, },
"preferGlobal": "true", "preferGlobal": "true",
"scripts": { "scripts": {
"test": "" "release": "bash release.sh"
}, },
"main": "./src/diff2html.js", "main": "./src/diff2html.js",
"dependencies": { "dependencies": {
"diff": "1.4.0" "diff": "2.2.*"
},
"devDependencies": {
"webpack": "1.12.*",
"uglifyjs": "2.4.*",
"less": "2.5.*"
}, },
"devDependencies": {},
"license": "MIT", "license": "MIT",
"files": [ "files": [
"src" "src"

4
release.sh
View file

@ -17,10 +17,6 @@ echo "Cleaning previous versions ..."
rm -rf ${OUTPUT_DIR} rm -rf ${OUTPUT_DIR}
mkdir -p ${OUTPUT_DIR} mkdir -p ${OUTPUT_DIR}
echo "Preparing dependencies ..."
rm -rf node_modules
npm install
echo "Generating js aggregation file in ${OUTPUT_JS_FILE}" echo "Generating js aggregation file in ${OUTPUT_JS_FILE}"
webpack ./src/diff2html.js ${OUTPUT_JS_FILE} webpack ./src/diff2html.js ${OUTPUT_JS_FILE}

6
sample/index.html
View file

@ -9,15 +9,15 @@
Author: rtfpessoa Author: rtfpessoa
--> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
<!-- --> <!-- -->
<link rel="stylesheet" type="text/css" href="../dist/diff2html.min.css"> <link rel="stylesheet" type="text/css" href="../dist/diff2html.min.css">
<script type="text/javascript" src="../dist/diff2html.min.js"></script> <script type="text/javascript" src="../dist/diff2html.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.9.1/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/languages/scala.min.js"></script>
<script> <script>
var lineDiffExample = var lineDiffExample =

8
src/line-by-line-printer.js
View file

@ -28,8 +28,12 @@
return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' + return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
' <div class="d2h-file-header">\n' + ' <div class="d2h-file-header">\n' +
' <div class="d2h-file-stats">\n' + ' <div class="d2h-file-stats">\n' +
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' + ' <span class="d2h-lines-added">' +
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' + ' <span>+' + file.addedLines + '</span>\n' +
' </span>\n' +
' <span class="d2h-lines-deleted">' +
' <span>-' + file.deletedLines + '</span>\n' +
' </span>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' + ' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
' </div>\n' + ' </div>\n' +

8
src/side-by-side-printer.js
View file

@ -28,8 +28,12 @@
return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' + return '<div id="' + printerUtils.getHtmlId(file) + '" class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
' <div class="d2h-file-header">\n' + ' <div class="d2h-file-header">\n' +
' <div class="d2h-file-stats">\n' + ' <div class="d2h-file-stats">\n' +
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' + ' <span class="d2h-lines-added">' +
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' + ' <span>+' + file.addedLines + '</span>\n' +
' </span>\n' +
' <span class="d2h-lines-deleted">' +
' <span>-' + file.deletedLines + '</span>\n' +
' </span>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' + ' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
' </div>\n' + ' </div>\n' +