Skip to content

Commit 3929ca2

Browse files
committed
Fix /dev/null filename on html generation
1 parent 465dde6 commit 3929ca2

File tree

5 files changed

+333
-297
lines changed

5 files changed

+333
-297
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": "2.0.0-beta7",
3+
"version": "2.0.0-beta9",
44
"homepage": "http://rtfpessoa.github.io/diff2html/",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [

dist/diff2html.js

Lines changed: 317 additions & 282 deletions
Large diffs are not rendered by default.

dist/diff2html.min.js

Lines changed: 3 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html",
3-
"version": "2.0.0-beta7",
3+
"version": "2.0.0-beta9",
44
"homepage": "http://rtfpessoa.github.io/diff2html/",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [
@@ -34,7 +34,7 @@
3434
"engines": {
3535
"node": ">=0.10"
3636
},
37-
"preferGlobal": "true",
37+
"preferGlobal": true,
3838
"scripts": {
3939
"release": "bash release.sh",
4040
"test": "mocha",
@@ -43,18 +43,18 @@
4343
},
4444
"main": "./src/diff2html.js",
4545
"dependencies": {
46-
"diff": "^2.2.1",
47-
"nunjucks": "^2.3.0"
46+
"diff": "^2.2.2",
47+
"nunjucks": "^2.4.1"
4848
},
4949
"devDependencies": {
50-
"clean-css": "^3.4.9",
50+
"clean-css": "^3.4.10",
5151
"codacy-coverage": "^1.1.3",
5252
"fast-html-parser": "^1.0.1",
5353
"istanbul": "^0.4.2",
54-
"jscs": "^2.10.1",
54+
"jscs": "^2.11.0",
5555
"mocha": "^2.4.5",
5656
"uglifyjs": "^2.4.10",
57-
"webpack": "^1.12.13"
57+
"webpack": "^1.12.14"
5858
},
5959
"license": "MIT",
6060
"files": [

src/printer-utils.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
var oldFilename = file.oldName;
4040
var newFilename = file.newName;
4141

42-
if (oldFilename && newFilename && oldFilename !== newFilename && !isDeletedName(newFilename)) {
42+
if (oldFilename && newFilename && oldFilename !== newFilename
43+
&& !isDevNullName(oldFilename) && !isDevNullName(newFilename)) {
4344
return oldFilename + ' -> ' + newFilename;
44-
} else if (newFilename && !isDeletedName(newFilename)) {
45+
} else if (newFilename && !isDevNullName(newFilename)) {
4546
return newFilename;
4647
} else if (oldFilename) {
4748
return oldFilename;
@@ -132,8 +133,8 @@
132133
};
133134
};
134135

135-
function isDeletedName(name) {
136-
return name === 'dev/null';
136+
function isDevNullName(name) {
137+
return name.indexOf('dev/null') !== -1;
137138
}
138139

139140
function removeIns(line) {

0 commit comments

Comments
 (0)