diff --git a/css/diff2html.css b/css/diff2html.css index f4bbc48..7a69479 100644 --- a/css/diff2html.css +++ b/css/diff2html.css @@ -266,7 +266,7 @@ ins.d2h-change, del.d2h-change { background-color: #fae1af; } .d2h-file-diff .d2h-ins.d2h-change { - background-color: #faedaf; + background-color: #ded; } /* CSS only show/hide */ diff --git a/src/diff-parser.js b/src/diff-parser.js index a8baa96..4d78a51 100644 --- a/src/diff-parser.js +++ b/src/diff-parser.js @@ -12,6 +12,8 @@ var LINE_TYPE = { INSERTS: 'd2h-ins', DELETES: 'd2h-del', + INSERT_CHANGES: 'd2h-ins d2h-change', + DELETE_CHANGES: 'd2h-del d2h-change', CONTEXT: 'd2h-cntx', INFO: 'd2h-info' }; diff --git a/src/line-by-line-printer.js b/src/line-by-line-printer.js index 58a4990..c528bf3 100644 --- a/src/line-by-line-printer.js +++ b/src/line-by-line-printer.js @@ -89,10 +89,10 @@ var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); processedOldLines += - generateLineHtml(oldLine.type + ' d2h-change', oldLine.oldNumber, oldLine.newNumber, + generateLineHtml(diffParser.LINE_TYPE.DELETE_CHANGES, oldLine.oldNumber, oldLine.newNumber, diff.first.line, diff.first.prefix); processedNewLines += - generateLineHtml(newLine.type + ' d2h-change', newLine.oldNumber, newLine.newNumber, + generateLineHtml(diffParser.LINE_TYPE.INSERT_CHANGES, newLine.oldNumber, newLine.newNumber, diff.second.line, diff.second.prefix); } diff --git a/src/side-by-side-printer.js b/src/side-by-side-printer.js index 6ace22a..045f7a9 100644 --- a/src/side-by-side-printer.js +++ b/src/side-by-side-printer.js @@ -113,10 +113,10 @@ var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config); fileHtml.left += - generateSingleLineHtml(oldLine.type + ' d2h-change', oldLine.oldNumber, + generateSingleLineHtml(diffParser.LINE_TYPE.DELETE_CHANGES, oldLine.oldNumber, diff.first.line, diff.first.prefix); fileHtml.right += - generateSingleLineHtml(newLine.type + ' d2h-change', newLine.newNumber, + generateSingleLineHtml(diffParser.LINE_TYPE.INSERT_CHANGES, newLine.newNumber, diff.second.line, diff.second.prefix); } if (max > common) {