Merge pull request #18 from rtfpessoa/webpack-for-the-browser
Webpack for the browser
This commit is contained in:
Rodrigo Fernandes
commit
ca8cfe0528
17 changed files with 1913 additions and 2494 deletions
|
|
@ -1,3 +0,0 @@
|
|||
#!/usr/bin/env node
|
||||
|
||||
require("../src/diff2html.js");
|
||||
18
bower.json
18
bower.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "diff2html",
|
||||
"version": "0.2.5-1",
|
||||
"version": "1.0.0",
|
||||
"homepage": "http://rtfpessoa.github.io/diff2html/",
|
||||
"description": "Fast Diff to colorized HTML",
|
||||
"keywords": [
|
||||
|
|
@ -20,37 +20,25 @@
|
|||
"difftohtml",
|
||||
"colorized"
|
||||
],
|
||||
|
||||
"authors": [
|
||||
"Rodrigo Fernandes <rtfrodrigo@gmail.com>"
|
||||
],
|
||||
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/rtfpessoa/diff2html.git"
|
||||
},
|
||||
|
||||
"main": "./src/diff2html.js",
|
||||
|
||||
"license": "MIT",
|
||||
|
||||
"moduleType": [
|
||||
"globals",
|
||||
"node"
|
||||
],
|
||||
|
||||
"dependencies": {
|
||||
"jsdiff": ">= 1.4.0"
|
||||
},
|
||||
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"bower_components",
|
||||
"test",
|
||||
"tests",
|
||||
"bin",
|
||||
"package.json",
|
||||
"release.sh"
|
||||
"release.sh",
|
||||
"config.jscs.json"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
49
config.jscs.json
Normal file
49
config.jscs.json
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{
|
||||
"disallowKeywords": [
|
||||
"with"
|
||||
],
|
||||
"disallowKeywordsOnNewLine": [
|
||||
"else"
|
||||
],
|
||||
"disallowMixedSpacesAndTabs": true,
|
||||
"disallowMultipleVarDecl": "exceptUndefined",
|
||||
"disallowNewlineBeforeBlockStatements": true,
|
||||
"disallowQuotedKeysInObjects": true,
|
||||
"disallowSpaceAfterObjectKeys": true,
|
||||
"disallowSpaceAfterPrefixUnaryOperators": true,
|
||||
"disallowSpacesInFunction": {
|
||||
"beforeOpeningRoundBrace": true
|
||||
},
|
||||
"disallowSpacesInsideParentheses": true,
|
||||
"disallowTrailingWhitespace": true,
|
||||
"maximumLineLength": 120,
|
||||
"requireCamelCaseOrUpperCaseIdentifiers": true,
|
||||
"requireCapitalizedComments": true,
|
||||
"requireCapitalizedConstructors": true,
|
||||
"requireCurlyBraces": true,
|
||||
"requireSpaceAfterKeywords": [
|
||||
"if",
|
||||
"else",
|
||||
"for",
|
||||
"while",
|
||||
"do",
|
||||
"switch",
|
||||
"case",
|
||||
"return",
|
||||
"try",
|
||||
"catch",
|
||||
"typeof"
|
||||
],
|
||||
"requireSpaceAfterLineComment": true,
|
||||
"requireSpaceAfterBinaryOperators": true,
|
||||
"requireSpaceBeforeBinaryOperators": true,
|
||||
"requireSpaceBeforeBlockStatements": true,
|
||||
"requireSpaceBeforeObjectValues": true,
|
||||
"requireSpacesInFunction": {
|
||||
"beforeOpeningCurlyBrace": true
|
||||
},
|
||||
"requireTrailingComma": null,
|
||||
"validateIndentation": 2,
|
||||
"validateLineBreaks": "LF",
|
||||
"validateQuoteMarks": "'"
|
||||
}
|
||||
1636
dist/diff2html.js
vendored
1636
dist/diff2html.js
vendored
File diff suppressed because it is too large
Load diff
2
dist/diff2html.min.js
vendored
2
dist/diff2html.min.js
vendored
File diff suppressed because one or more lines are too long
643
lib/diff.js
643
lib/diff.js
|
|
@ -1,643 +0,0 @@
|
|||
/* See LICENSE file for terms of use */
|
||||
|
||||
/*
|
||||
* Text diff implementation.
|
||||
*
|
||||
* This library supports the following APIS:
|
||||
* JsDiff.diffChars: Character by character diff
|
||||
* JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
|
||||
* JsDiff.diffLines: Line based diff
|
||||
*
|
||||
* JsDiff.diffCss: Diff targeted at CSS content
|
||||
*
|
||||
* These methods are based on the implementation proposed in
|
||||
* "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
|
||||
* http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
|
||||
*/
|
||||
(function (global, undefined) {
|
||||
var objectPrototypeToString = Object.prototype.toString;
|
||||
|
||||
/*istanbul ignore next*/
|
||||
function map(arr, mapper, that) {
|
||||
if (Array.prototype.map) {
|
||||
return Array.prototype.map.call(arr, mapper, that);
|
||||
}
|
||||
|
||||
var other = new Array(arr.length);
|
||||
|
||||
for (var i = 0, n = arr.length; i < n; i++) {
|
||||
other[i] = mapper.call(that, arr[i], i, arr);
|
||||
}
|
||||
return other;
|
||||
}
|
||||
|
||||
function clonePath(path) {
|
||||
return {newPos: path.newPos, components: path.components.slice(0)};
|
||||
}
|
||||
|
||||
function removeEmpty(array) {
|
||||
var ret = [];
|
||||
for (var i = 0; i < array.length; i++) {
|
||||
if (array[i]) {
|
||||
ret.push(array[i]);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
function escapeHTML(s) {
|
||||
var n = s;
|
||||
n = n.replace(/&/g, '&');
|
||||
n = n.replace(/</g, '<');
|
||||
n = n.replace(/>/g, '>');
|
||||
n = n.replace(/"/g, '"');
|
||||
|
||||
return n;
|
||||
}
|
||||
|
||||
// This function handles the presence of circular references by bailing out when encountering an
|
||||
// object that is already on the "stack" of items being processed.
|
||||
function canonicalize(obj, stack, replacementStack) {
|
||||
stack = stack || [];
|
||||
replacementStack = replacementStack || [];
|
||||
|
||||
var i;
|
||||
|
||||
for (i = 0; i < stack.length; i += 1) {
|
||||
if (stack[i] === obj) {
|
||||
return replacementStack[i];
|
||||
}
|
||||
}
|
||||
|
||||
var canonicalizedObj;
|
||||
|
||||
if ('[object Array]' === objectPrototypeToString.call(obj)) {
|
||||
stack.push(obj);
|
||||
canonicalizedObj = new Array(obj.length);
|
||||
replacementStack.push(canonicalizedObj);
|
||||
for (i = 0; i < obj.length; i += 1) {
|
||||
canonicalizedObj[i] = canonicalize(obj[i], stack, replacementStack);
|
||||
}
|
||||
stack.pop();
|
||||
replacementStack.pop();
|
||||
} else if (typeof obj === 'object' && obj !== null) {
|
||||
stack.push(obj);
|
||||
canonicalizedObj = {};
|
||||
replacementStack.push(canonicalizedObj);
|
||||
var sortedKeys = [],
|
||||
key;
|
||||
for (key in obj) {
|
||||
sortedKeys.push(key);
|
||||
}
|
||||
sortedKeys.sort();
|
||||
for (i = 0; i < sortedKeys.length; i += 1) {
|
||||
key = sortedKeys[i];
|
||||
canonicalizedObj[key] = canonicalize(obj[key], stack, replacementStack);
|
||||
}
|
||||
stack.pop();
|
||||
replacementStack.pop();
|
||||
} else {
|
||||
canonicalizedObj = obj;
|
||||
}
|
||||
return canonicalizedObj;
|
||||
}
|
||||
|
||||
function buildValues(components, newString, oldString, useLongestToken) {
|
||||
var componentPos = 0,
|
||||
componentLen = components.length,
|
||||
newPos = 0,
|
||||
oldPos = 0;
|
||||
|
||||
for (; componentPos < componentLen; componentPos++) {
|
||||
var component = components[componentPos];
|
||||
if (!component.removed) {
|
||||
if (!component.added && useLongestToken) {
|
||||
var value = newString.slice(newPos, newPos + component.count);
|
||||
value = map(value, function (value, i) {
|
||||
var oldValue = oldString[oldPos + i];
|
||||
return oldValue.length > value.length ? oldValue : value;
|
||||
});
|
||||
|
||||
component.value = value.join('');
|
||||
} else {
|
||||
component.value = newString.slice(newPos, newPos + component.count).join('');
|
||||
}
|
||||
newPos += component.count;
|
||||
|
||||
// Common case
|
||||
if (!component.added) {
|
||||
oldPos += component.count;
|
||||
}
|
||||
} else {
|
||||
component.value = oldString.slice(oldPos, oldPos + component.count).join('');
|
||||
oldPos += component.count;
|
||||
|
||||
// Reverse add and remove so removes are output first to match common convention
|
||||
// The diffing algorithm is tied to add then remove output and this is the simplest
|
||||
// route to get the desired output with minimal overhead.
|
||||
if (componentPos && components[componentPos - 1].added) {
|
||||
var tmp = components[componentPos - 1];
|
||||
components[componentPos - 1] = components[componentPos];
|
||||
components[componentPos] = tmp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return components;
|
||||
}
|
||||
|
||||
function Diff(ignoreWhitespace) {
|
||||
this.ignoreWhitespace = ignoreWhitespace;
|
||||
}
|
||||
|
||||
Diff.prototype = {
|
||||
diff: function (oldString, newString, callback) {
|
||||
var self = this;
|
||||
|
||||
function done(value) {
|
||||
if (callback) {
|
||||
setTimeout(function () {
|
||||
callback(undefined, value);
|
||||
}, 0);
|
||||
return true;
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
// Handle the identity case (this is due to unrolling editLength == 0
|
||||
if (newString === oldString) {
|
||||
return done([{value: newString}]);
|
||||
}
|
||||
if (!newString) {
|
||||
return done([{value: oldString, removed: true}]);
|
||||
}
|
||||
if (!oldString) {
|
||||
return done([{value: newString, added: true}]);
|
||||
}
|
||||
|
||||
newString = this.tokenize(newString);
|
||||
oldString = this.tokenize(oldString);
|
||||
|
||||
var newLen = newString.length, oldLen = oldString.length;
|
||||
var editLength = 1;
|
||||
var maxEditLength = newLen + oldLen;
|
||||
var bestPath = [{newPos: -1, components: []}];
|
||||
|
||||
// Seed editLength = 0, i.e. the content starts with the same values
|
||||
var oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);
|
||||
if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
|
||||
// Identity per the equality and tokenizer
|
||||
return done([{value: newString.join('')}]);
|
||||
}
|
||||
|
||||
// Main worker method. checks all permutations of a given edit length for acceptance.
|
||||
function execEditLength() {
|
||||
for (var diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {
|
||||
var basePath;
|
||||
var addPath = bestPath[diagonalPath - 1],
|
||||
removePath = bestPath[diagonalPath + 1],
|
||||
oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;
|
||||
if (addPath) {
|
||||
// No one else is going to attempt to use this value, clear it
|
||||
bestPath[diagonalPath - 1] = undefined;
|
||||
}
|
||||
|
||||
var canAdd = addPath && addPath.newPos + 1 < newLen,
|
||||
canRemove = removePath && 0 <= oldPos && oldPos < oldLen;
|
||||
if (!canAdd && !canRemove) {
|
||||
// If this path is a terminal then prune
|
||||
bestPath[diagonalPath] = undefined;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Select the diagonal that we want to branch from. We select the prior
|
||||
// path whose position in the new string is the farthest from the origin
|
||||
// and does not pass the bounds of the diff graph
|
||||
if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
|
||||
basePath = clonePath(removePath);
|
||||
self.pushComponent(basePath.components, undefined, true);
|
||||
} else {
|
||||
basePath = addPath; // No need to clone, we've pulled it from the list
|
||||
basePath.newPos++;
|
||||
self.pushComponent(basePath.components, true, undefined);
|
||||
}
|
||||
|
||||
oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
|
||||
|
||||
// If we have hit the end of both strings, then we are done
|
||||
if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
|
||||
return done(buildValues(basePath.components, newString, oldString, self.useLongestToken));
|
||||
} else {
|
||||
// Otherwise track this path as a potential candidate and continue.
|
||||
bestPath[diagonalPath] = basePath;
|
||||
}
|
||||
}
|
||||
|
||||
editLength++;
|
||||
}
|
||||
|
||||
// Performs the length of edit iteration. Is a bit fugly as this has to support the
|
||||
// sync and async mode which is never fun. Loops over execEditLength until a value
|
||||
// is produced.
|
||||
if (callback) {
|
||||
(function exec() {
|
||||
setTimeout(function () {
|
||||
// This should not happen, but we want to be safe.
|
||||
/*istanbul ignore next */
|
||||
if (editLength > maxEditLength) {
|
||||
return callback();
|
||||
}
|
||||
|
||||
if (!execEditLength()) {
|
||||
exec();
|
||||
}
|
||||
}, 0);
|
||||
}());
|
||||
} else {
|
||||
while (editLength <= maxEditLength) {
|
||||
var ret = execEditLength();
|
||||
if (ret) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
pushComponent: function (components, added, removed) {
|
||||
var last = components[components.length - 1];
|
||||
if (last && last.added === added && last.removed === removed) {
|
||||
// We need to clone here as the component clone operation is just
|
||||
// as shallow array clone
|
||||
components[components.length - 1] = {count: last.count + 1, added: added, removed: removed};
|
||||
} else {
|
||||
components.push({count: 1, added: added, removed: removed});
|
||||
}
|
||||
},
|
||||
extractCommon: function (basePath, newString, oldString, diagonalPath) {
|
||||
var newLen = newString.length,
|
||||
oldLen = oldString.length,
|
||||
newPos = basePath.newPos,
|
||||
oldPos = newPos - diagonalPath,
|
||||
|
||||
commonCount = 0;
|
||||
while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {
|
||||
newPos++;
|
||||
oldPos++;
|
||||
commonCount++;
|
||||
}
|
||||
|
||||
if (commonCount) {
|
||||
basePath.components.push({count: commonCount});
|
||||
}
|
||||
|
||||
basePath.newPos = newPos;
|
||||
return oldPos;
|
||||
},
|
||||
|
||||
equals: function (left, right) {
|
||||
var reWhitespace = /\S/;
|
||||
return left === right || (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right));
|
||||
},
|
||||
tokenize: function (value) {
|
||||
return value.split('');
|
||||
}
|
||||
};
|
||||
|
||||
var CharDiff = new Diff();
|
||||
|
||||
var WordDiff = new Diff(true);
|
||||
var WordWithSpaceDiff = new Diff();
|
||||
WordDiff.tokenize = WordWithSpaceDiff.tokenize = function (value) {
|
||||
return removeEmpty(value.split(/(\s+|\b)/));
|
||||
};
|
||||
|
||||
var CssDiff = new Diff(true);
|
||||
CssDiff.tokenize = function (value) {
|
||||
return removeEmpty(value.split(/([{}:;,]|\s+)/));
|
||||
};
|
||||
|
||||
var LineDiff = new Diff();
|
||||
|
||||
var TrimmedLineDiff = new Diff();
|
||||
TrimmedLineDiff.ignoreTrim = true;
|
||||
|
||||
LineDiff.tokenize = TrimmedLineDiff.tokenize = function (value) {
|
||||
var retLines = [],
|
||||
lines = value.split(/^/m);
|
||||
for (var i = 0; i < lines.length; i++) {
|
||||
var line = lines[i],
|
||||
lastLine = lines[i - 1],
|
||||
lastLineLastChar = lastLine && lastLine[lastLine.length - 1];
|
||||
|
||||
// Merge lines that may contain windows new lines
|
||||
if (line === '\n' && lastLineLastChar === '\r') {
|
||||
retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0, -1) + '\r\n';
|
||||
} else {
|
||||
if (this.ignoreTrim) {
|
||||
line = line.trim();
|
||||
// add a newline unless this is the last line.
|
||||
if (i < lines.length - 1) {
|
||||
line += '\n';
|
||||
}
|
||||
}
|
||||
retLines.push(line);
|
||||
}
|
||||
}
|
||||
|
||||
return retLines;
|
||||
};
|
||||
|
||||
var PatchDiff = new Diff();
|
||||
PatchDiff.tokenize = function (value) {
|
||||
var ret = [],
|
||||
linesAndNewlines = value.split(/(\n|\r\n)/);
|
||||
|
||||
// Ignore the final empty token that occurs if the string ends with a new line
|
||||
if (!linesAndNewlines[linesAndNewlines.length - 1]) {
|
||||
linesAndNewlines.pop();
|
||||
}
|
||||
|
||||
// Merge the content and line separators into single tokens
|
||||
for (var i = 0; i < linesAndNewlines.length; i++) {
|
||||
var line = linesAndNewlines[i];
|
||||
|
||||
if (i % 2) {
|
||||
ret[ret.length - 1] += line;
|
||||
} else {
|
||||
ret.push(line);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
|
||||
var SentenceDiff = new Diff();
|
||||
SentenceDiff.tokenize = function (value) {
|
||||
return removeEmpty(value.split(/(\S.+?[.!?])(?=\s+|$)/));
|
||||
};
|
||||
|
||||
var JsonDiff = new Diff();
|
||||
// Discriminate between two lines of pretty-printed, serialized JSON where one of them has a
|
||||
// dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:
|
||||
JsonDiff.useLongestToken = true;
|
||||
JsonDiff.tokenize = LineDiff.tokenize;
|
||||
JsonDiff.equals = function (left, right) {
|
||||
return LineDiff.equals(left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'));
|
||||
};
|
||||
|
||||
var JsDiff = {
|
||||
Diff: Diff,
|
||||
|
||||
diffChars: function (oldStr, newStr, callback) {
|
||||
return CharDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
diffWords: function (oldStr, newStr, callback) {
|
||||
return WordDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
diffWordsWithSpace: function (oldStr, newStr, callback) {
|
||||
return WordWithSpaceDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
diffLines: function (oldStr, newStr, callback) {
|
||||
return LineDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
diffTrimmedLines: function (oldStr, newStr, callback) {
|
||||
return TrimmedLineDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
|
||||
diffSentences: function (oldStr, newStr, callback) {
|
||||
return SentenceDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
|
||||
diffCss: function (oldStr, newStr, callback) {
|
||||
return CssDiff.diff(oldStr, newStr, callback);
|
||||
},
|
||||
diffJson: function (oldObj, newObj, callback) {
|
||||
return JsonDiff.diff(
|
||||
typeof oldObj === 'string' ? oldObj : JSON.stringify(canonicalize(oldObj), undefined, ' '),
|
||||
typeof newObj === 'string' ? newObj : JSON.stringify(canonicalize(newObj), undefined, ' '),
|
||||
callback
|
||||
);
|
||||
},
|
||||
|
||||
createTwoFilesPatch: function (oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader) {
|
||||
var ret = [];
|
||||
|
||||
if (oldFileName == newFileName) {
|
||||
ret.push('Index: ' + oldFileName);
|
||||
}
|
||||
ret.push('===================================================================');
|
||||
ret.push('--- ' + oldFileName + (typeof oldHeader === 'undefined' ? '' : '\t' + oldHeader));
|
||||
ret.push('+++ ' + newFileName + (typeof newHeader === 'undefined' ? '' : '\t' + newHeader));
|
||||
|
||||
var diff = PatchDiff.diff(oldStr, newStr);
|
||||
diff.push({value: '', lines: []}); // Append an empty value to make cleanup easier
|
||||
|
||||
// Formats a given set of lines for printing as context lines in a patch
|
||||
function contextLines(lines) {
|
||||
return map(lines, function (entry) {
|
||||
return ' ' + entry;
|
||||
});
|
||||
}
|
||||
|
||||
// Outputs the no newline at end of file warning if needed
|
||||
function eofNL(curRange, i, current) {
|
||||
var last = diff[diff.length - 2],
|
||||
isLast = i === diff.length - 2,
|
||||
isLastOfType = i === diff.length - 3 && current.added !== last.added;
|
||||
|
||||
// Figure out if this is the last line for the given file and missing NL
|
||||
if (!(/\n$/.test(current.value)) && (isLast || isLastOfType)) {
|
||||
curRange.push('\\ No newline at end of file');
|
||||
}
|
||||
}
|
||||
|
||||
var oldRangeStart = 0, newRangeStart = 0, curRange = [],
|
||||
oldLine = 1, newLine = 1;
|
||||
for (var i = 0; i < diff.length; i++) {
|
||||
var current = diff[i],
|
||||
lines = current.lines || current.value.replace(/\n$/, '').split('\n');
|
||||
current.lines = lines;
|
||||
|
||||
if (current.added || current.removed) {
|
||||
// If we have previous context, start with that
|
||||
if (!oldRangeStart) {
|
||||
var prev = diff[i - 1];
|
||||
oldRangeStart = oldLine;
|
||||
newRangeStart = newLine;
|
||||
|
||||
if (prev) {
|
||||
curRange = contextLines(prev.lines.slice(-4));
|
||||
oldRangeStart -= curRange.length;
|
||||
newRangeStart -= curRange.length;
|
||||
}
|
||||
}
|
||||
|
||||
// Output our changes
|
||||
curRange.push.apply(curRange, map(lines, function (entry) {
|
||||
return (current.added ? '+' : '-') + entry;
|
||||
}));
|
||||
eofNL(curRange, i, current);
|
||||
|
||||
// Track the updated file position
|
||||
if (current.added) {
|
||||
newLine += lines.length;
|
||||
} else {
|
||||
oldLine += lines.length;
|
||||
}
|
||||
} else {
|
||||
// Identical context lines. Track line changes
|
||||
if (oldRangeStart) {
|
||||
// Close out any changes that have been output (or join overlapping)
|
||||
if (lines.length <= 8 && i < diff.length - 2) {
|
||||
// Overlapping
|
||||
curRange.push.apply(curRange, contextLines(lines));
|
||||
} else {
|
||||
// end the range and output
|
||||
var contextSize = Math.min(lines.length, 4);
|
||||
ret.push(
|
||||
'@@ -' + oldRangeStart + ',' + (oldLine - oldRangeStart + contextSize)
|
||||
+ ' +' + newRangeStart + ',' + (newLine - newRangeStart + contextSize)
|
||||
+ ' @@');
|
||||
ret.push.apply(ret, curRange);
|
||||
ret.push.apply(ret, contextLines(lines.slice(0, contextSize)));
|
||||
if (lines.length <= 4) {
|
||||
eofNL(ret, i, current);
|
||||
}
|
||||
|
||||
oldRangeStart = 0;
|
||||
newRangeStart = 0;
|
||||
curRange = [];
|
||||
}
|
||||
}
|
||||
oldLine += lines.length;
|
||||
newLine += lines.length;
|
||||
}
|
||||
}
|
||||
|
||||
return ret.join('\n') + '\n';
|
||||
},
|
||||
|
||||
createPatch: function (fileName, oldStr, newStr, oldHeader, newHeader) {
|
||||
return JsDiff.createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader);
|
||||
},
|
||||
|
||||
applyPatch: function (oldStr, uniDiff) {
|
||||
var diffstr = uniDiff.split('\n'),
|
||||
hunks = [],
|
||||
i = 0,
|
||||
remEOFNL = false,
|
||||
addEOFNL = false;
|
||||
|
||||
// Skip to the first change hunk
|
||||
while (i < diffstr.length && !(/^@@/.test(diffstr[i]))) {
|
||||
i++;
|
||||
}
|
||||
|
||||
// Parse the unified diff
|
||||
for (; i < diffstr.length; i++) {
|
||||
if (diffstr[i][0] === '@') {
|
||||
var chnukHeader = diffstr[i].split(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
|
||||
hunks.unshift({
|
||||
start: chnukHeader[3],
|
||||
oldlength: +chnukHeader[2],
|
||||
removed: [],
|
||||
newlength: chnukHeader[4],
|
||||
added: []
|
||||
});
|
||||
} else if (diffstr[i][0] === '+') {
|
||||
hunks[0].added.push(diffstr[i].substr(1));
|
||||
} else if (diffstr[i][0] === '-') {
|
||||
hunks[0].removed.push(diffstr[i].substr(1));
|
||||
} else if (diffstr[i][0] === ' ') {
|
||||
hunks[0].added.push(diffstr[i].substr(1));
|
||||
hunks[0].removed.push(diffstr[i].substr(1));
|
||||
} else if (diffstr[i][0] === '\\') {
|
||||
if (diffstr[i - 1][0] === '+') {
|
||||
remEOFNL = true;
|
||||
} else if (diffstr[i - 1][0] === '-') {
|
||||
addEOFNL = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Apply the diff to the input
|
||||
var lines = oldStr.split('\n');
|
||||
for (i = hunks.length - 1; i >= 0; i--) {
|
||||
var hunk = hunks[i];
|
||||
// Sanity check the input string. Bail if we don't match.
|
||||
for (var j = 0; j < hunk.oldlength; j++) {
|
||||
if (lines[hunk.start - 1 + j] !== hunk.removed[j]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Array.prototype.splice.apply(lines, [hunk.start - 1, hunk.oldlength].concat(hunk.added));
|
||||
}
|
||||
|
||||
// Handle EOFNL insertion/removal
|
||||
if (remEOFNL) {
|
||||
while (!lines[lines.length - 1]) {
|
||||
lines.pop();
|
||||
}
|
||||
} else if (addEOFNL) {
|
||||
lines.push('');
|
||||
}
|
||||
return lines.join('\n');
|
||||
},
|
||||
|
||||
convertChangesToXML: function (changes) {
|
||||
var ret = [];
|
||||
for (var i = 0; i < changes.length; i++) {
|
||||
var change = changes[i];
|
||||
if (change.added) {
|
||||
ret.push('<ins>');
|
||||
} else if (change.removed) {
|
||||
ret.push('<del>');
|
||||
}
|
||||
|
||||
ret.push(escapeHTML(change.value));
|
||||
|
||||
if (change.added) {
|
||||
ret.push('</ins>');
|
||||
} else if (change.removed) {
|
||||
ret.push('</del>');
|
||||
}
|
||||
}
|
||||
return ret.join('');
|
||||
},
|
||||
|
||||
// See: http://code.google.com/p/google-diff-match-patch/wiki/API
|
||||
convertChangesToDMP: function (changes) {
|
||||
var ret = [],
|
||||
change,
|
||||
operation;
|
||||
for (var i = 0; i < changes.length; i++) {
|
||||
change = changes[i];
|
||||
if (change.added) {
|
||||
operation = 1;
|
||||
} else if (change.removed) {
|
||||
operation = -1;
|
||||
} else {
|
||||
operation = 0;
|
||||
}
|
||||
|
||||
ret.push([operation, change.value]);
|
||||
}
|
||||
return ret;
|
||||
},
|
||||
|
||||
canonicalize: canonicalize
|
||||
};
|
||||
|
||||
/*istanbul ignore next */
|
||||
/*global module */
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports = JsDiff;
|
||||
} else if (typeof define === 'function' && define.amd) {
|
||||
/*global define */
|
||||
define([], function () {
|
||||
return JsDiff;
|
||||
});
|
||||
} else if (typeof global.JsDiff === 'undefined') {
|
||||
global.JsDiff = JsDiff;
|
||||
}
|
||||
}(this));
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* Hack to allow nodejs require("package/file") in the browser
|
||||
* How?
|
||||
* Since every require is used as an object:
|
||||
* `require("./utils.js").Utils` // (notice the `.Utils`)
|
||||
*
|
||||
* We can say that when there is no require method
|
||||
* we use the global object in which the `Utils`
|
||||
* object was already injected.
|
||||
*/
|
||||
|
||||
var $globalHolder = (typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof this !== 'undefined' && this) ||
|
||||
Function('return this')();
|
||||
function require() {
|
||||
return $globalHolder;
|
||||
}
|
||||
19
package.json
19
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "diff2html",
|
||||
"version": "0.2.6-1",
|
||||
"version": "1.0.0",
|
||||
"homepage": "http://rtfpessoa.github.io/diff2html/",
|
||||
"description": "Fast Diff to colorized HTML",
|
||||
"keywords": [
|
||||
|
|
@ -20,48 +20,31 @@
|
|||
"difftohtml",
|
||||
"colorized"
|
||||
],
|
||||
|
||||
"author": {
|
||||
"name": "Rodrigo Fernandes",
|
||||
"email": "rtfrodrigo@gmail.com"
|
||||
},
|
||||
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://www.github.com/rtfpessoa/diff2html.git"
|
||||
},
|
||||
|
||||
"bugs": {
|
||||
"url": "https://www.github.com/rtfpessoa/diff2html/issues"
|
||||
},
|
||||
|
||||
"engines": {
|
||||
"node": ">=0.10"
|
||||
},
|
||||
|
||||
"preferGlobal": "true",
|
||||
|
||||
"scripts": {
|
||||
"test": ""
|
||||
},
|
||||
|
||||
"bin": {
|
||||
"diff2html-lib": "./bin/diff2html"
|
||||
},
|
||||
|
||||
"main": "./src/diff2html.js",
|
||||
|
||||
"dependencies": {
|
||||
"diff": "1.4.0"
|
||||
},
|
||||
|
||||
"devDependencies": {},
|
||||
|
||||
"license": "MIT",
|
||||
|
||||
"files": [
|
||||
"bin",
|
||||
"lib",
|
||||
"src"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
22
release.sh
22
release.sh
|
|
@ -1,7 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
#
|
||||
# Diff2Html release script
|
||||
# diff2html release script
|
||||
# by rtfpessoa
|
||||
#
|
||||
|
||||
OUTPUT_DIR=dist
|
||||
|
|
@ -10,24 +11,19 @@ OUTPUT_MIN_JS_FILE=${OUTPUT_DIR}/diff2html.min.js
|
|||
OUTPUT_CSS_FILE=${OUTPUT_DIR}/diff2html.css
|
||||
OUTPUT_MIN_CSS_FILE=${OUTPUT_DIR}/diff2html.min.css
|
||||
|
||||
echo "Creating Diff2Html release ..."
|
||||
echo "Creating diff2html release ..."
|
||||
|
||||
echo "Cleaning previous versions ..."
|
||||
rm -rf ${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 "// Diff2Html minifier version (automatically generated)" > ${OUTPUT_JS_FILE}
|
||||
cat lib/fakeRequire.js >> ${OUTPUT_JS_FILE}
|
||||
cat lib/diff.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/utils.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/diff-parser.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/printer-utils.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/side-by-side-printer.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/line-by-line-printer.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/html-printer.js >> ${OUTPUT_JS_FILE}
|
||||
cat src/diff2html.js >> ${OUTPUT_JS_FILE}
|
||||
webpack ./src/diff2html.js ${OUTPUT_JS_FILE}
|
||||
|
||||
echo "Minifying ${OUTPUT_JS_FILE} to ${OUTPUT_MIN_JS_FILE}"
|
||||
|
||||
|
|
@ -41,4 +37,4 @@ echo "Minifying ${OUTPUT_CSS_FILE} to ${OUTPUT_MIN_CSS_FILE}"
|
|||
|
||||
lessc -x ${OUTPUT_CSS_FILE} ${OUTPUT_MIN_CSS_FILE}
|
||||
|
||||
echo "Diff2Html release created successfully!"
|
||||
echo "diff2html release created successfully!"
|
||||
|
|
|
|||
|
|
@ -11,19 +11,6 @@
|
|||
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
|
||||
|
||||
<!--
|
||||
<link rel="stylesheet" type="text/css" href="../css/diff2html.css">
|
||||
<script type="text/javascript" src="../lib/diff.js"></script>
|
||||
<script type="text/javascript" src="../lib/fakeRequire.js"></script>
|
||||
<script type="text/javascript" src="../src/utils.js"></script>
|
||||
<script type="text/javascript" src="../src/diff-parser.js"></script>
|
||||
<script type="text/javascript" src="../src/printer-utils.js"></script>
|
||||
<script type="text/javascript" src="../src/side-by-side-printer.js"></script>
|
||||
<script type="text/javascript" src="../src/line-by-line-printer.js"></script>
|
||||
<script type="text/javascript" src="../src/html-printer.js"></script>
|
||||
<script type="text/javascript" src="../src/diff2html.js"></script>
|
||||
-->
|
||||
|
||||
<!-- -->
|
||||
<link rel="stylesheet" type="text/css" href="../dist/diff2html.min.css">
|
||||
<script type="text/javascript" src="../dist/diff2html.min.js"></script>
|
||||
|
|
@ -215,19 +202,29 @@
|
|||
"+var text = 'diff --git a/components/app/app.html b/components/app/app.html\\nindex ecb7a95..027bd9b 100644\\n--- a/components/app/app.html\\n+++ b/components/app/app.html\\n@@ -52,0 +53,3 @@\\n+\\n+\\n+\\n@@ -56,0 +60,3 @@\\n+\\n+\\n+\\n'\n" +
|
||||
'+var patchLineList = [ false, false, false, false ];\n' +
|
||||
'+\n' +
|
||||
'+console.log(parser.parsePatchDiffResult(text, patchLineList));\n';
|
||||
'+console.log(parser.parsePatchDiffResult(text, patchLineList));\n' +
|
||||
"diff --git a/a.xml b/b.xml\n" +
|
||||
"index e54317e..82a9a56 100644\n" +
|
||||
"--- a/a.xml\n" +
|
||||
"+++ b/b.xml\n" +
|
||||
"@@ -242,4 +242,6 @@ need to create a new job for native server java api and move these tests to a ne\n" +
|
||||
" </packages>\n" +
|
||||
" </test>\n" +
|
||||
" -->\n" +
|
||||
"+\n" +
|
||||
"+\n";
|
||||
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
document.addEventListener("DOMContentLoaded", function() {
|
||||
// parse the diff to json
|
||||
var diffJson = Diff2Html.getJsonFromDiff(lineDiffExample);
|
||||
|
||||
// collect all the file extensions in the json
|
||||
var allFileLanguages = diffJson.map(function (line) {
|
||||
var allFileLanguages = diffJson.map(function(line) {
|
||||
return line.language;
|
||||
});
|
||||
|
||||
// remove duplicated languages
|
||||
var distinctLanguages = allFileLanguages.filter(function (v, i) {
|
||||
var distinctLanguages = allFileLanguages.filter(function(v, i) {
|
||||
return allFileLanguages.indexOf(v) == i;
|
||||
});
|
||||
|
||||
|
|
@ -240,7 +237,7 @@
|
|||
|
||||
// collect all the code lines and execute the highlight on them
|
||||
var codeLines = document.getElementsByClassName("d2h-code-line-ctn");
|
||||
[].forEach.call(codeLines, function (line) {
|
||||
[].forEach.call(codeLines, function(line) {
|
||||
hljs.highlightBlock(line);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
var utils = require("./utils.js").Utils;
|
||||
var utils = require('./utils.js').Utils;
|
||||
|
||||
var LINE_TYPE = {
|
||||
INSERTS: "d2h-ins",
|
||||
DELETES: "d2h-del",
|
||||
CONTEXT: "d2h-cntx",
|
||||
INFO: "d2h-info"
|
||||
INSERTS: 'd2h-ins',
|
||||
DELETES: 'd2h-del',
|
||||
CONTEXT: 'd2h-cntx',
|
||||
INFO: 'd2h-info'
|
||||
};
|
||||
|
||||
function DiffParser() {
|
||||
|
|
@ -21,24 +21,24 @@
|
|||
|
||||
DiffParser.prototype.LINE_TYPE = LINE_TYPE;
|
||||
|
||||
DiffParser.prototype.generateDiffJson = function (diffInput) {
|
||||
var files = [],
|
||||
currentFile = null,
|
||||
currentBlock = null,
|
||||
oldLine = null,
|
||||
newLine = null;
|
||||
DiffParser.prototype.generateDiffJson = function(diffInput) {
|
||||
var files = [];
|
||||
var currentFile = null;
|
||||
var currentBlock = null;
|
||||
var oldLine = null;
|
||||
var newLine = null;
|
||||
|
||||
var saveBlock = function () {
|
||||
/* add previous block(if exists) before start a new file */
|
||||
var saveBlock = function() {
|
||||
/* Add previous block(if exists) before start a new file */
|
||||
if (currentBlock) {
|
||||
currentFile.blocks.push(currentBlock);
|
||||
currentBlock = null;
|
||||
}
|
||||
};
|
||||
|
||||
var saveFile = function () {
|
||||
var saveFile = function() {
|
||||
/*
|
||||
* add previous file(if exists) before start a new one
|
||||
* Add previous file(if exists) before start a new one
|
||||
* if it has name (to avoid binary files errors)
|
||||
*/
|
||||
if (currentFile && currentFile.newName) {
|
||||
|
|
@ -47,18 +47,18 @@
|
|||
}
|
||||
};
|
||||
|
||||
var startFile = function () {
|
||||
var startFile = function() {
|
||||
saveBlock();
|
||||
saveFile();
|
||||
|
||||
/* create file structure */
|
||||
/* Create file structure */
|
||||
currentFile = {};
|
||||
currentFile.blocks = [];
|
||||
currentFile.deletedLines = 0;
|
||||
currentFile.addedLines = 0;
|
||||
};
|
||||
|
||||
var startBlock = function (line) {
|
||||
var startBlock = function(line) {
|
||||
saveBlock();
|
||||
|
||||
var values;
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
oldLine = values[1];
|
||||
newLine = values[2];
|
||||
|
||||
/* create block metadata */
|
||||
/* Create block metadata */
|
||||
currentBlock = {};
|
||||
currentBlock.lines = [];
|
||||
currentBlock.oldStartLine = oldLine;
|
||||
|
|
@ -83,12 +83,15 @@
|
|||
currentBlock.header = line;
|
||||
};
|
||||
|
||||
var createLine = function (line) {
|
||||
var createLine = function(line) {
|
||||
var currentLine = {};
|
||||
currentLine.content = line;
|
||||
|
||||
/* fill the line data */
|
||||
if (utils.startsWith(line, "+") || utils.startsWith(line, " +")) {
|
||||
var newLinePrefixes = !currentFile.isCombined ? ['+'] : ['+', ' +'];
|
||||
var delLinePrefixes = !currentFile.isCombined ? ['-'] : ['-', ' -'];
|
||||
|
||||
/* Fill the line data */
|
||||
if (utils.startsWith(line, newLinePrefixes)) {
|
||||
currentFile.addedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.INSERTS;
|
||||
|
|
@ -97,7 +100,7 @@
|
|||
|
||||
currentBlock.lines.push(currentLine);
|
||||
|
||||
} else if (utils.startsWith(line, "-") || utils.startsWith(line, " -")) {
|
||||
} else if (utils.startsWith(line, delLinePrefixes)) {
|
||||
currentFile.deletedLines++;
|
||||
|
||||
currentLine.type = LINE_TYPE.DELETES;
|
||||
|
|
@ -115,13 +118,12 @@
|
|||
}
|
||||
};
|
||||
|
||||
var diffLines = diffInput.split("\n");
|
||||
diffLines.forEach(function (line) {
|
||||
var diffLines = diffInput.split('\n');
|
||||
diffLines.forEach(function(line) {
|
||||
// Unmerged paths, and possibly other non-diffable files
|
||||
// https://github.com/scottgonzalez/pretty-diff/issues/11
|
||||
// Also, remove some useless lines
|
||||
if (!line || utils.startsWith(line, "*")) {
|
||||
//|| utils.startsWith(line, "new") || utils.startsWith(line, "index")
|
||||
if (!line || utils.startsWith(line, '*')) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -148,7 +150,7 @@
|
|||
var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/;
|
||||
|
||||
var values = [];
|
||||
if (utils.startsWith(line, "diff")) {
|
||||
if (utils.startsWith(line, 'diff')) {
|
||||
startFile();
|
||||
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
|
||||
currentFile.oldName = values[1];
|
||||
|
|
@ -156,7 +158,7 @@
|
|||
} else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [b]?\/(\S+).*$/.exec(line))) {
|
||||
currentFile.newName = values[1];
|
||||
currentFile.language = getExtension(currentFile.newName, currentFile.language);
|
||||
} else if (currentFile && utils.startsWith(line, "@@")) {
|
||||
} else if (currentFile && utils.startsWith(line, '@@')) {
|
||||
startBlock(line);
|
||||
} else if ((values = oldMode.exec(line))) {
|
||||
currentFile.oldMode = values[1];
|
||||
|
|
@ -208,17 +210,14 @@
|
|||
};
|
||||
|
||||
function getExtension(filename, language) {
|
||||
var nameSplit = filename.split(".");
|
||||
if (nameSplit.length > 1) return nameSplit[nameSplit.length - 1];
|
||||
else return language;
|
||||
var nameSplit = filename.split('.');
|
||||
if (nameSplit.length > 1) {
|
||||
return nameSplit[nameSplit.length - 1];
|
||||
} else {
|
||||
return language;
|
||||
}
|
||||
}
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["DiffParser"] = new DiffParser();
|
||||
module.exports['DiffParser'] = new DiffParser();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var htmlPrinter = require("./html-printer.js").HtmlPrinter;
|
||||
var diffParser = require('./diff-parser.js').DiffParser;
|
||||
var htmlPrinter = require('./html-printer.js').HtmlPrinter;
|
||||
|
||||
function Diff2Html() {
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
/*
|
||||
* Generates pretty html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput, config) {
|
||||
Diff2Html.prototype.getPrettyHtmlFromDiff = function(diffInput, config) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
var configOrEmpty = config || {};
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
|
||||
|
|
@ -34,14 +34,14 @@
|
|||
/*
|
||||
* Generates json object from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
|
||||
Diff2Html.prototype.getJsonFromDiff = function(diffInput) {
|
||||
return diffParser.generateDiffJson(diffInput);
|
||||
};
|
||||
|
||||
/*
|
||||
* Generates pretty html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson, config) {
|
||||
Diff2Html.prototype.getPrettyHtmlFromJson = function(diffJson, config) {
|
||||
var configOrEmpty = config || {};
|
||||
return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
|
||||
};
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
/*
|
||||
* Generates pretty side by side html from string diff input
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput, config) {
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function(diffInput, config) {
|
||||
var diffJson = diffParser.generateDiffJson(diffInput);
|
||||
|
||||
var configOrEmpty = config || {};
|
||||
|
|
@ -59,17 +59,15 @@
|
|||
/*
|
||||
* Generates pretty side by side html from a json object
|
||||
*/
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function (diffJson, config) {
|
||||
Diff2Html.prototype.getPrettySideBySideHtmlFromJson = function(diffJson, config) {
|
||||
var configOrEmpty = config || {};
|
||||
return htmlPrinter.generateSideBySideJsonHtml(diffJson, configOrEmpty);
|
||||
};
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["Diff2Html"] = new Diff2Html();
|
||||
var diffName = 'Diff2Html';
|
||||
var diffObject = new Diff2Html();
|
||||
module.exports[diffName] = diffObject;
|
||||
// Expose diff2html in the browser
|
||||
global[diffName] = diffObject;
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
var lineByLinePrinter = require("./line-by-line-printer.js").LineByLinePrinter;
|
||||
var sideBySidePrinter = require("./side-by-side-printer.js").SideBySidePrinter;
|
||||
var lineByLinePrinter = require('./line-by-line-printer.js').LineByLinePrinter;
|
||||
var sideBySidePrinter = require('./side-by-side-printer.js').SideBySidePrinter;
|
||||
|
||||
function HtmlPrinter() {
|
||||
}
|
||||
|
|
@ -17,12 +17,6 @@
|
|||
|
||||
HtmlPrinter.prototype.generateSideBySideJsonHtml = sideBySidePrinter.generateSideBySideJsonHtml;
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["HtmlPrinter"] = new HtmlPrinter();
|
||||
module.exports['HtmlPrinter'] = new HtmlPrinter();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,57 +5,62 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var printerUtils = require("./printer-utils.js").PrinterUtils;
|
||||
var utils = require("./utils.js").Utils;
|
||||
var diffParser = require('./diff-parser.js').DiffParser;
|
||||
var printerUtils = require('./printer-utils.js').PrinterUtils;
|
||||
var utils = require('./utils.js').Utils;
|
||||
|
||||
function LineByLinePrinter() {
|
||||
}
|
||||
|
||||
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function (diffFiles, config) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
LineByLinePrinter.prototype.generateLineByLineJsonHtml = function(diffFiles, config) {
|
||||
return '<div class="d2h-wrapper">\n' +
|
||||
diffFiles.map(function(file) {
|
||||
|
||||
var diffs;
|
||||
if (file.blocks.length) diffs = generateFileHtml(file, config);
|
||||
else diffs = generateEmptyDiff();
|
||||
if (file.blocks.length) {
|
||||
diffs = generateFileHtml(file, config);
|
||||
} else {
|
||||
diffs = generateEmptyDiff();
|
||||
}
|
||||
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
return '<div class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
|
||||
' <div class="d2h-file-header">\n' +
|
||||
' <div class="d2h-file-stats">\n' +
|
||||
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
|
||||
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
|
||||
' </div>\n' +
|
||||
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
|
||||
' </div>\n' +
|
||||
' <div class="d2h-file-diff">\n' +
|
||||
' <div class="d2h-code-wrapper">\n' +
|
||||
' <table class="d2h-diff-table">\n' +
|
||||
' <tbody class="d2h-diff-tbody">\n' +
|
||||
' ' + diffs +
|
||||
' </tbody>\n' +
|
||||
' </table>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n';
|
||||
}).join('\n') +
|
||||
'</div>\n';
|
||||
};
|
||||
|
||||
function generateFileHtml(file, config) {
|
||||
return file.blocks.map(function (block) {
|
||||
return file.blocks.map(function(block) {
|
||||
|
||||
var lines = "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
var lines = '<tr>\n' +
|
||||
' <td class="d2h-code-linenumber ' + diffParser.LINE_TYPE.INFO + '"></td>\n' +
|
||||
' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' <div class="d2h-code-line ' + diffParser.LINE_TYPE.INFO + '">' + utils.escape(block.header) + '</div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
var processedOldLines = [], processedNewLines = [];
|
||||
var oldLines = [];
|
||||
var newLines = [];
|
||||
var processedOldLines = [];
|
||||
var processedNewLines = [];
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
|
|
@ -81,8 +86,12 @@
|
|||
config.isCombined = file.isCombined;
|
||||
var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config);
|
||||
|
||||
processedOldLines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, diff.first.line, diff.first.prefix);
|
||||
processedNewLines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, diff.second.line, diff.second.prefix);
|
||||
processedOldLines +=
|
||||
generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber,
|
||||
diff.first.line, diff.first.prefix);
|
||||
processedNewLines +=
|
||||
generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber,
|
||||
diff.second.line, diff.second.prefix);
|
||||
}
|
||||
|
||||
lines += processedOldLines + processedNewLines;
|
||||
|
|
@ -101,11 +110,11 @@
|
|||
lines += processLines(oldLines, newLines);
|
||||
|
||||
return lines;
|
||||
}).join("\n");
|
||||
}).join('\n');
|
||||
}
|
||||
|
||||
function processLines(oldLines, newLines) {
|
||||
var lines = "";
|
||||
var lines = '';
|
||||
|
||||
for (j = 0; j < oldLines.length; j++) {
|
||||
var oldLine = oldLines[j];
|
||||
|
|
@ -123,39 +132,37 @@
|
|||
}
|
||||
|
||||
function generateLineHtml(type, oldNumber, newNumber, content, prefix) {
|
||||
var htmlPrefix = "";
|
||||
if (prefix) htmlPrefix = "<span class=\"d2h-code-line-prefix\">" + prefix + "</span>";
|
||||
var htmlPrefix = '';
|
||||
if (prefix) {
|
||||
htmlPrefix = '<span class="d2h-code-line-prefix">' + prefix + '</span>';
|
||||
}
|
||||
|
||||
var htmlContent = "";
|
||||
if (content) htmlContent = "<span class=\"d2h-code-line-ctn\">" + content + "</span>";
|
||||
var htmlContent = '';
|
||||
if (content) {
|
||||
htmlContent = '<span class="d2h-code-line-ctn">' + content + '</span>';
|
||||
}
|
||||
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-linenumber " + type + "\">" +
|
||||
" <div class=\"line-num1\">" + utils.valueOrEmpty(oldNumber) + "</div>" +
|
||||
" <div class=\"line-num2\">" + utils.valueOrEmpty(newNumber) + "</div>" +
|
||||
" </td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
return '<tr>\n' +
|
||||
' <td class="d2h-code-linenumber ' + type + '">' +
|
||||
' <div class="line-num1">' + utils.valueOrEmpty(oldNumber) + '</div>' +
|
||||
' <div class="line-num2">' + utils.valueOrEmpty(newNumber) + '</div>' +
|
||||
' </td>\n' +
|
||||
' <td class="' + type + '">' +
|
||||
' <div class="d2h-code-line ' + type + '">' + htmlPrefix + htmlContent + '</div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
}
|
||||
|
||||
function generateEmptyDiff() {
|
||||
return "<tr>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-line " + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
"File without changes" +
|
||||
" </div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
return '<tr>\n' +
|
||||
' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' <div class="d2h-code-line ' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
'File without changes' +
|
||||
' </div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
}
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["LineByLinePrinter"] = new LineByLinePrinter();
|
||||
module.exports['LineByLinePrinter'] = new LineByLinePrinter();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,38 +5,39 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
// dirty hack for browser compatibility
|
||||
var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("diff");
|
||||
var utils = require("./utils.js").Utils;
|
||||
var jsDiff = require('diff');
|
||||
var utils = require('./utils.js').Utils;
|
||||
|
||||
function PrinterUtils() {
|
||||
}
|
||||
|
||||
PrinterUtils.prototype.getDiffName = function (file) {
|
||||
PrinterUtils.prototype.getDiffName = function(file) {
|
||||
var oldFilename = file.oldName;
|
||||
var newFilename = file.newName;
|
||||
|
||||
if (oldFilename && newFilename
|
||||
&& oldFilename !== newFilename
|
||||
&& !isDeletedName(newFilename)) {
|
||||
return oldFilename + " -> " + newFilename;
|
||||
return oldFilename + ' -> ' + newFilename;
|
||||
} else if (newFilename && !isDeletedName(newFilename)) {
|
||||
return newFilename;
|
||||
} else if (oldFilename) {
|
||||
return oldFilename;
|
||||
} else {
|
||||
return "Unknown filename";
|
||||
return 'Unknown filename';
|
||||
}
|
||||
};
|
||||
|
||||
PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, config) {
|
||||
PrinterUtils.prototype.diffHighlight = function(diffLine1, diffLine2, config) {
|
||||
var lineStart1, lineStart2;
|
||||
|
||||
var prefixSize = 1;
|
||||
|
||||
if (config.isCombined) prefixSize = 2;
|
||||
if (config.isCombined) {
|
||||
prefixSize = 2;
|
||||
}
|
||||
|
||||
lineStart1 = diffLine1.substr(0, prefixSize);
|
||||
lineStart2 = diffLine2.substr(0, prefixSize);
|
||||
|
|
@ -45,17 +46,23 @@
|
|||
diffLine2 = diffLine2.substr(prefixSize);
|
||||
|
||||
var diff;
|
||||
if (config.charByChar) diff = jsDiff.diffChars(diffLine1, diffLine2);
|
||||
else diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
|
||||
if (config.charByChar) {
|
||||
diff = jsDiff.diffChars(diffLine1, diffLine2);
|
||||
} else {
|
||||
diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
|
||||
}
|
||||
|
||||
var highlightedLine = "";
|
||||
var highlightedLine = '';
|
||||
|
||||
diff.forEach(function (part) {
|
||||
diff.forEach(function(part) {
|
||||
var elemType = part.added ? 'ins' : part.removed ? 'del' : null;
|
||||
var escapedValue = utils.escape(part.value);
|
||||
|
||||
if (elemType !== null) highlightedLine += "<" + elemType + ">" + escapedValue + "</" + elemType + ">";
|
||||
else highlightedLine += escapedValue;
|
||||
if (elemType !== null) {
|
||||
highlightedLine += '<' + elemType + '>' + escapedValue + '</' + elemType + '>';
|
||||
} else {
|
||||
highlightedLine += escapedValue;
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
|
|
@ -71,23 +78,17 @@
|
|||
};
|
||||
|
||||
function isDeletedName(name) {
|
||||
return name === "dev/null";
|
||||
return name === 'dev/null';
|
||||
}
|
||||
|
||||
function removeIns(line) {
|
||||
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
|
||||
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, '');
|
||||
}
|
||||
|
||||
function removeDel(line) {
|
||||
return line.replace(/(<del>((.|\n)*?)<\/del>)/g, "");
|
||||
return line.replace(/(<del>((.|\n)*?)<\/del>)/g, '');
|
||||
}
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["PrinterUtils"] = new PrinterUtils();
|
||||
module.exports['PrinterUtils'] = new PrinterUtils();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
|
|
@ -5,79 +5,85 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
var diffParser = require("./diff-parser.js").DiffParser;
|
||||
var printerUtils = require("./printer-utils.js").PrinterUtils;
|
||||
var utils = require("./utils.js").Utils;
|
||||
var diffParser = require('./diff-parser.js').DiffParser;
|
||||
var printerUtils = require('./printer-utils.js').PrinterUtils;
|
||||
var utils = require('./utils.js').Utils;
|
||||
|
||||
function SideBySidePrinter() {
|
||||
}
|
||||
|
||||
SideBySidePrinter.prototype.generateSideBySideJsonHtml = function (diffFiles, config) {
|
||||
return "<div class=\"d2h-wrapper\">\n" +
|
||||
diffFiles.map(function (file) {
|
||||
SideBySidePrinter.prototype.generateSideBySideJsonHtml = function(diffFiles, config) {
|
||||
return '<div class="d2h-wrapper">\n' +
|
||||
diffFiles.map(function(file) {
|
||||
|
||||
var diffs;
|
||||
if (file.blocks.length) diffs = generateSideBySideFileHtml(file, config);
|
||||
else diffs = generateEmptyDiff();
|
||||
if (file.blocks.length) {
|
||||
diffs = generateSideBySideFileHtml(file, config);
|
||||
} else {
|
||||
diffs = generateEmptyDiff();
|
||||
}
|
||||
|
||||
return "<div class=\"d2h-file-wrapper\" data-lang=\"" + file.language + "\">\n" +
|
||||
" <div class=\"d2h-file-header\">\n" +
|
||||
" <div class=\"d2h-file-stats\">\n" +
|
||||
" <span class=\"d2h-lines-added\">+" + file.addedLines + "</span>\n" +
|
||||
" <span class=\"d2h-lines-deleted\">-" + file.deletedLines + "</span>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-name\">" + printerUtils.getDiffName(file) + "</div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-files-diff\">\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.left +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" <div class=\"d2h-file-side-diff\">\n" +
|
||||
" <div class=\"d2h-code-wrapper\">\n" +
|
||||
" <table class=\"d2h-diff-table\">\n" +
|
||||
" <tbody class=\"d2h-diff-tbody\">\n" +
|
||||
" " + diffs.right +
|
||||
" </tbody>\n" +
|
||||
" </table>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n" +
|
||||
" </div>\n";
|
||||
}).join("\n") +
|
||||
"</div>\n";
|
||||
return '<div class="d2h-file-wrapper" data-lang="' + file.language + '">\n' +
|
||||
' <div class="d2h-file-header">\n' +
|
||||
' <div class="d2h-file-stats">\n' +
|
||||
' <span class="d2h-lines-added">+' + file.addedLines + '</span>\n' +
|
||||
' <span class="d2h-lines-deleted">-' + file.deletedLines + '</span>\n' +
|
||||
' </div>\n' +
|
||||
' <div class="d2h-file-name">' + printerUtils.getDiffName(file) + '</div>\n' +
|
||||
' </div>\n' +
|
||||
' <div class="d2h-files-diff">\n' +
|
||||
' <div class="d2h-file-side-diff">\n' +
|
||||
' <div class="d2h-code-wrapper">\n' +
|
||||
' <table class="d2h-diff-table">\n' +
|
||||
' <tbody class="d2h-diff-tbody">\n' +
|
||||
' ' + diffs.left +
|
||||
' </tbody>\n' +
|
||||
' </table>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' <div class="d2h-file-side-diff">\n' +
|
||||
' <div class="d2h-code-wrapper">\n' +
|
||||
' <table class="d2h-diff-table">\n' +
|
||||
' <tbody class="d2h-diff-tbody">\n' +
|
||||
' ' + diffs.right +
|
||||
' </tbody>\n' +
|
||||
' </table>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n';
|
||||
}).join('\n') +
|
||||
'</div>\n';
|
||||
};
|
||||
|
||||
function generateSideBySideFileHtml(file, config) {
|
||||
var fileHtml = {};
|
||||
fileHtml.left = "";
|
||||
fileHtml.right = "";
|
||||
fileHtml.left = '';
|
||||
fileHtml.right = '';
|
||||
|
||||
file.blocks.forEach(function (block) {
|
||||
file.blocks.forEach(function(block) {
|
||||
|
||||
fileHtml.left += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" + utils.escape(block.header) + "</div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
fileHtml.left += '<tr>\n' +
|
||||
' <td class="d2h-code-side-linenumber ' + diffParser.LINE_TYPE.INFO + '"></td>\n' +
|
||||
' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' <div class="d2h-code-side-line ' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' ' + utils.escape(block.header) +
|
||||
' </div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
|
||||
fileHtml.right += "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + diffParser.LINE_TYPE.INFO + "\"></td>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\"></div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
fileHtml.right += '<tr>\n' +
|
||||
' <td class="d2h-code-side-linenumber ' + diffParser.LINE_TYPE.INFO + '"></td>\n' +
|
||||
' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' <div class="d2h-code-side-line ' + diffParser.LINE_TYPE.INFO + '"></div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
|
||||
var oldLines = [], newLines = [];
|
||||
var tmpHtml = "";
|
||||
var oldLines = [];
|
||||
var newLines = [];
|
||||
var tmpHtml = '';
|
||||
|
||||
for (var i = 0; i < block.lines.length; i++) {
|
||||
var line = block.lines[i];
|
||||
|
|
@ -87,7 +93,7 @@
|
|||
fileHtml.left += generateSingleLineHtml(line.type, line.oldNumber, escapedLine);
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', '');
|
||||
fileHtml.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
|
||||
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
|
||||
oldLines.push(line);
|
||||
|
|
@ -106,8 +112,12 @@
|
|||
|
||||
var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config);
|
||||
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, diff.first.line, diff.first.prefix);
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, diff.second.line, diff.second.prefix);
|
||||
fileHtml.left +=
|
||||
generateSingleLineHtml(oldLine.type, oldLine.oldNumber,
|
||||
diff.first.line, diff.first.prefix);
|
||||
fileHtml.right +=
|
||||
generateSingleLineHtml(newLine.type, newLine.newNumber,
|
||||
diff.second.line, diff.second.prefix);
|
||||
}
|
||||
} else {
|
||||
tmpHtml = processLines(oldLines, newLines);
|
||||
|
|
@ -131,8 +141,8 @@
|
|||
|
||||
function processLines(oldLines, newLines) {
|
||||
var fileHtml = {};
|
||||
fileHtml.left = "";
|
||||
fileHtml.right = "";
|
||||
fileHtml.left = '';
|
||||
fileHtml.right = '';
|
||||
|
||||
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
|
||||
for (j = 0; j < maxLinesNumber; j++) {
|
||||
|
|
@ -144,12 +154,12 @@
|
|||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else if (oldLine) {
|
||||
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.right += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', '');
|
||||
} else if (newLine) {
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, "", "", "");
|
||||
fileHtml.left += generateSingleLineHtml(diffParser.LINE_TYPE.CONTEXT, '', '', '');
|
||||
fileHtml.right += generateSingleLineHtml(newLine.type, newLine.newNumber, utils.escape(newLine.content));
|
||||
} else {
|
||||
console.error("How did it get here?");
|
||||
console.error('How did it get here?');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -157,41 +167,39 @@
|
|||
}
|
||||
|
||||
function generateSingleLineHtml(type, number, content, prefix) {
|
||||
var htmlPrefix = "";
|
||||
if (prefix) htmlPrefix = "<span class=\"d2h-code-line-prefix\">" + prefix + "</span>";
|
||||
var htmlPrefix = '';
|
||||
if (prefix) {
|
||||
htmlPrefix = '<span class="d2h-code-line-prefix">' + prefix + '</span>';
|
||||
}
|
||||
|
||||
var htmlContent = "";
|
||||
if (content) htmlContent = "<span class=\"d2h-code-line-ctn\">" + content + "</span>";
|
||||
var htmlContent = '';
|
||||
if (content) {
|
||||
htmlContent = '<span class="d2h-code-line-ctn">' + content + '</span>';
|
||||
}
|
||||
|
||||
return "<tr>\n" +
|
||||
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
|
||||
" <td class=\"" + type + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
|
||||
" </td>\n" +
|
||||
" </tr>\n";
|
||||
return '<tr>\n' +
|
||||
' <td class="d2h-code-side-linenumber ' + type + '">' + number + '</td>\n' +
|
||||
' <td class="' + type + '">' +
|
||||
' <div class="d2h-code-side-line ' + type + '">' + htmlPrefix + htmlContent + '</div>' +
|
||||
' </td>\n' +
|
||||
' </tr>\n';
|
||||
}
|
||||
|
||||
function generateEmptyDiff() {
|
||||
var fileHtml = {};
|
||||
fileHtml.right = "";
|
||||
fileHtml.right = '';
|
||||
|
||||
fileHtml.left = "<tr>\n" +
|
||||
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" +
|
||||
"File without changes" +
|
||||
" </div>" +
|
||||
" </td>\n" +
|
||||
"</tr>\n";
|
||||
fileHtml.left = '<tr>\n' +
|
||||
' <td class="' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
' <div class="d2h-code-side-line ' + diffParser.LINE_TYPE.INFO + '">' +
|
||||
'File without changes' +
|
||||
' </div>' +
|
||||
' </td>\n' +
|
||||
'</tr>\n';
|
||||
|
||||
return fileHtml;
|
||||
}
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["SideBySidePrinter"] = new SideBySidePrinter();
|
||||
module.exports['SideBySidePrinter'] = new SideBySidePrinter();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
37
src/utils.js
37
src/utils.js
|
|
@ -5,33 +5,38 @@
|
|||
*
|
||||
*/
|
||||
|
||||
(function (ctx, undefined) {
|
||||
(function(ctx, undefined) {
|
||||
|
||||
function Utils() {
|
||||
}
|
||||
|
||||
Utils.prototype.escape = function (str) {
|
||||
Utils.prototype.escape = function(str) {
|
||||
return str.slice(0)
|
||||
.replace(/&/g, "&")
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/\t/g, " ");
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/\t/g, ' ');
|
||||
};
|
||||
|
||||
Utils.prototype.startsWith = function (str, start) {
|
||||
Utils.prototype.startsWith = function(str, start) {
|
||||
if (typeof start === 'object') {
|
||||
var result = false;
|
||||
start.forEach(function(s) {
|
||||
if (str.indexOf(s) === 0) {
|
||||
result = true;
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return str.indexOf(start) === 0;
|
||||
};
|
||||
|
||||
Utils.prototype.valueOrEmpty = function (value) {
|
||||
return value ? value : "";
|
||||
Utils.prototype.valueOrEmpty = function(value) {
|
||||
return value ? value : '';
|
||||
};
|
||||
|
||||
// expose this module
|
||||
((typeof module !== 'undefined' && module.exports) ||
|
||||
(typeof exports !== 'undefined' && exports) ||
|
||||
(typeof window !== 'undefined' && window) ||
|
||||
(typeof self !== 'undefined' && self) ||
|
||||
(typeof $this !== 'undefined' && $this) ||
|
||||
Function('return this')())["Utils"] = new Utils();
|
||||
module.exports['Utils'] = new Utils();
|
||||
|
||||
})(this);
|
||||
|
|
|
|||
Loading…
Reference in a new issue