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

Fix /dev/null filename on html generation

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-03-20 23:33:48 +00:00
parent 465dde689a
commit 3929ca28fc
5 changed files with 337 additions and 301 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": "2.0.0-beta7", "version": "2.0.0-beta9",
"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": [

607
dist/diff2html.js vendored
View file

File diff suppressed because one or more lines are too long

6
dist/diff2html.min.js vendored
View file

File diff suppressed because one or more lines are too long

14
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "diff2html", "name": "diff2html",
"version": "2.0.0-beta7", "version": "2.0.0-beta9",
"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": [
@ -34,7 +34,7 @@
"engines": { "engines": {
"node": ">=0.10" "node": ">=0.10"
}, },
"preferGlobal": "true", "preferGlobal": true,
"scripts": { "scripts": {
"release": "bash release.sh", "release": "bash release.sh",
"test": "mocha", "test": "mocha",
@ -43,18 +43,18 @@
}, },
"main": "./src/diff2html.js", "main": "./src/diff2html.js",
"dependencies": { "dependencies": {
"diff": "^2.2.1", "diff": "^2.2.2",
"nunjucks": "^2.3.0" "nunjucks": "^2.4.1"
}, },
"devDependencies": { "devDependencies": {
"clean-css": "^3.4.9", "clean-css": "^3.4.10",
"codacy-coverage": "^1.1.3", "codacy-coverage": "^1.1.3",
"fast-html-parser": "^1.0.1", "fast-html-parser": "^1.0.1",
"istanbul": "^0.4.2", "istanbul": "^0.4.2",
"jscs": "^2.10.1", "jscs": "^2.11.0",
"mocha": "^2.4.5", "mocha": "^2.4.5",
"uglifyjs": "^2.4.10", "uglifyjs": "^2.4.10",
"webpack": "^1.12.13" "webpack": "^1.12.14"
}, },
"license": "MIT", "license": "MIT",
"files": [ "files": [

9
src/printer-utils.js
View file

@ -39,9 +39,10 @@
var oldFilename = file.oldName; var oldFilename = file.oldName;
var newFilename = file.newName; var newFilename = file.newName;
if (oldFilename && newFilename && oldFilename !== newFilename && !isDeletedName(newFilename)) { if (oldFilename && newFilename && oldFilename !== newFilename
&& !isDevNullName(oldFilename) && !isDevNullName(newFilename)) {
return oldFilename + ' -> ' + newFilename; return oldFilename + ' -> ' + newFilename;
} else if (newFilename && !isDeletedName(newFilename)) { } else if (newFilename && !isDevNullName(newFilename)) {
return newFilename; return newFilename;
} else if (oldFilename) { } else if (oldFilename) {
return oldFilename; return oldFilename;
@ -132,8 +133,8 @@
}; };
}; };
function isDeletedName(name) { function isDevNullName(name) {
return name === 'dev/null'; return name.indexOf('dev/null') !== -1;
} }
function removeIns(line) { function removeIns(line) {