diff2html/dist/diff2html.js

1480 lines
48 KiB
JavaScript
Raw Normal View History

2015-05-03 13:09:07 +00:00
// Diff2Html minifier version (automatically generated)
/*
* 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')();
2015-05-03 13:09:07 +00:00
function require() {
return $globalHolder;
}
/* See LICENSE file for terms of use */
2015-05-03 13:09:07 +00:00
/*
* 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
*/
2015-07-18 23:23:36 +00:00
(function (global, undefined) {
var objectPrototypeToString = Object.prototype.toString;
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
/*istanbul ignore next*/
function map(arr, mapper, that) {
if (Array.prototype.map) {
return Array.prototype.map.call(arr, mapper, that);
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var other = new Array(arr.length);
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
for (var i = 0, n = arr.length; i < n; i++) {
other[i] = mapper.call(that, arr[i], i, arr);
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
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]);
2015-05-03 13:09:07 +00:00
}
}
2015-07-18 23:23:36 +00:00
return ret;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
function escapeHTML(s) {
var n = s;
n = n.replace(/&/g, '&amp;');
n = n.replace(/</g, '&lt;');
n = n.replace(/>/g, '&gt;');
n = n.replace(/"/g, '&quot;');
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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];
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
var canonicalizedObj;
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
return canonicalizedObj;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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('');
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
newPos += component.count;
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// Common case
if (!component.added) {
oldPos += component.count;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
} 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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
return components;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
function Diff(ignoreWhitespace) {
this.ignoreWhitespace = ignoreWhitespace;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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}]);
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
newString = this.tokenize(newString);
oldString = this.tokenize(oldString);
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var newLen = newString.length, oldLen = oldString.length;
var editLength = 1;
var maxEditLength = newLen + oldLen;
var bestPath = [{newPos: -1, components: []}];
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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('')}]);
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
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;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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);
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
}
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
editLength++;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
// 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();
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
if (!execEditLength()) {
exec();
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}, 0);
}());
} else {
while (editLength <= maxEditLength) {
var ret = execEditLength();
if (ret) {
return ret;
2015-05-03 13:09:07 +00:00
}
}
}
2015-07-18 23:23:36 +00:00
},
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++;
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
if (commonCount) {
basePath.components.push({count: commonCount});
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
basePath.newPos = newPos;
return oldPos;
},
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
equals: function (left, right) {
var reWhitespace = /\S/;
return left === right || (this.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right));
},
tokenize: function (value) {
return value.split('');
}
};
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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+)/));
};
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var LineDiff = new Diff();
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var TrimmedLineDiff = new Diff();
TrimmedLineDiff.ignoreTrim = true;
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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];
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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';
}
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
retLines.push(line);
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
return retLines;
};
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var PatchDiff = new Diff();
PatchDiff.tokenize = function (value) {
var ret = [],
linesAndNewlines = value.split(/(\n|\r\n)/);
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
2015-05-03 13:09:07 +00:00
} else {
2015-07-18 23:23:36 +00:00
ret.push(line);
2015-05-03 13:09:07 +00:00
}
}
2015-07-18 23:23:36 +00:00
return ret;
};
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
var SentenceDiff = new Diff();
SentenceDiff.tokenize = function (value) {
return removeEmpty(value.split(/(\S.+?[.!?])(?=\s+|$)/));
};
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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');
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
2015-05-03 13:09:07 +00:00
} else {
2015-07-18 23:23:36 +00:00
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);
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
oldRangeStart = 0;
newRangeStart = 0;
curRange = [];
2015-05-03 13:09:07 +00:00
}
}
2015-07-18 23:23:36 +00:00
oldLine += lines.length;
newLine += lines.length;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
return ret.join('\n') + '\n';
},
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
createPatch: function (fileName, oldStr, newStr, oldHeader, newHeader) {
return JsDiff.createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader);
},
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
applyPatch: function (oldStr, uniDiff) {
var diffstr = uniDiff.split('\n'),
hunks = [],
i = 0,
remEOFNL = false,
addEOFNL = false;
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
2015-05-03 13:09:07 +00:00
}
}
2015-07-18 23:23:36 +00:00
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// 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;
2015-05-03 13:09:07 +00:00
}
}
2015-07-18 23:23:36 +00:00
Array.prototype.splice.apply(lines, [hunk.start - 1, hunk.oldlength].concat(hunk.added));
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
// Handle EOFNL insertion/removal
if (remEOFNL) {
while (!lines[lines.length - 1]) {
lines.pop();
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
} else if (addEOFNL) {
lines.push('');
}
return lines.join('\n');
},
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
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>');
}
2015-05-03 13:09:07 +00:00
2015-07-18 23:23:36 +00:00
ret.push(escapeHTML(change.value));
if (change.added) {
ret.push('</ins>');
} else if (change.removed) {
ret.push('</del>');
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
}
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;
2015-05-03 13:09:07 +00:00
}
2015-07-18 23:23:36 +00:00
ret.push([operation, change.value]);
}
return ret;
},
canonicalize: canonicalize
};
2015-05-03 13:09:07 +00:00
/*istanbul ignore next */
2015-07-18 23:23:36 +00:00
/*global module */
2015-05-03 13:09:07 +00:00
if (typeof module !== 'undefined' && module.exports) {
module.exports = JsDiff;
2015-07-18 23:23:36 +00:00
} else if (typeof define === 'function' && define.amd) {
2015-05-03 13:09:07 +00:00
/*global define */
2015-07-18 23:23:36 +00:00
define([], function () {
return JsDiff;
});
} else if (typeof global.JsDiff === 'undefined') {
2015-05-03 13:09:07 +00:00
global.JsDiff = JsDiff;
}
2015-07-18 23:23:36 +00:00
}(this));
/*
2015-05-03 13:09:07 +00:00
*
* Utils (utils.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
function Utils() {
}
Utils.prototype.escape = function (str) {
return str.slice(0)
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/\t/g, " ");
};
Utils.prototype.startsWith = function (str, start) {
return str.indexOf(start) === 0;
};
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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* Diff Parser (diff-parser.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
var utils = require("./utils.js").Utils;
var LINE_TYPE = {
INSERTS: "d2h-ins",
DELETES: "d2h-del",
CONTEXT: "d2h-cntx",
INFO: "d2h-info"
};
function DiffParser() {
}
DiffParser.prototype.LINE_TYPE = LINE_TYPE;
DiffParser.prototype.generateDiffJson = function (diffInput) {
var files = [],
currentFile = null,
currentBlock = null,
oldLine = null,
newLine = null;
var saveBlock = function () {
/* add previous block(if exists) before start a new file */
if (currentBlock) {
currentFile.blocks.push(currentBlock);
currentBlock = null;
}
};
var saveFile = function () {
/*
* add previous file(if exists) before start a new one
* if it has name (to avoid binary files errors)
*/
if (currentFile && currentFile.newName) {
files.push(currentFile);
currentFile = null;
}
};
var startFile = function () {
saveBlock();
saveFile();
/* create file structure */
currentFile = {};
currentFile.blocks = [];
currentFile.deletedLines = 0;
currentFile.addedLines = 0;
};
var startBlock = function (line) {
saveBlock();
var values;
if (values = /^@@ -(\d+),\d+ \+(\d+),\d+ @@.*/.exec(line)) {
currentFile.isCombined = false;
} else if (values = /^@@@ -(\d+),\d+ -\d+,\d+ \+(\d+),\d+ @@@.*/.exec(line)) {
currentFile.isCombined = true;
} else {
values = [0, 0];
currentFile.isCombined = false;
}
oldLine = values[1];
newLine = values[2];
/* create block metadata */
currentBlock = {};
currentBlock.lines = [];
currentBlock.oldStartLine = oldLine;
currentBlock.newStartLine = newLine;
currentBlock.header = line;
};
var createLine = function (line) {
var currentLine = {};
currentLine.content = line;
/* fill the line data */
if (utils.startsWith(line, "+") || utils.startsWith(line, " +")) {
currentFile.addedLines++;
currentLine.type = LINE_TYPE.INSERTS;
currentLine.oldNumber = null;
currentLine.newNumber = newLine++;
currentBlock.lines.push(currentLine);
} else if (utils.startsWith(line, "-") || utils.startsWith(line, " -")) {
currentFile.deletedLines++;
currentLine.type = LINE_TYPE.DELETES;
currentLine.oldNumber = oldLine++;
currentLine.newNumber = null;
currentBlock.lines.push(currentLine);
} else {
currentLine.type = LINE_TYPE.CONTEXT;
currentLine.oldNumber = oldLine++;
currentLine.newNumber = newLine++;
currentBlock.lines.push(currentLine);
}
};
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")
return;
}
/* Diff */
var oldMode = /^old mode (\d{6})/;
var newMode = /^new mode (\d{6})/;
var deletedFileMode = /^deleted file mode (\d{6})/;
var newFileMode = /^new file mode (\d{6})/;
2015-05-03 13:09:07 +00:00
var copyFrom = /^copy from (.+)/;
var copyTo = /^copy to (.+)/;
2015-05-03 13:09:07 +00:00
var renameFrom = /^rename from (.+)/;
var renameTo = /^rename to (.+)/;
2015-05-03 13:09:07 +00:00
var similarityIndex = /^similarity index (\d+)%/;
var dissimilarityIndex = /^dissimilarity index (\d+)%/;
var index = /^index ([0-9a-z]+)..([0-9a-z]+) (\d{6})?/;
2015-05-03 13:09:07 +00:00
/* Combined Diff */
var combinedIndex = /^index ([0-9a-z]+),([0-9a-z]+)..([0-9a-z]+)/;
var combinedMode = /^mode (\d{6}),(\d{6})..(\d{6})/;
var combinedNewFile = /^new file mode (\d{6})/;
var combinedDeletedFile = /^deleted file mode (\d{6}),(\d{6})/;
2015-05-03 13:09:07 +00:00
var values = [];
if (utils.startsWith(line, "diff")) {
startFile();
} else if (currentFile && !currentFile.oldName && (values = /^--- a\/(\S+).*$/.exec(line))) {
currentFile.oldName = values[1];
currentFile.language = getExtension(currentFile.oldName, currentFile.language);
} 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, "@@")) {
startBlock(line);
} else if ((values = oldMode.exec(line))) {
currentFile.oldMode = values[1];
} else if ((values = newMode.exec(line))) {
currentFile.newMode = values[1];
} else if ((values = deletedFileMode.exec(line))) {
currentFile.deletedFileMode = values[1];
} else if ((values = newFileMode.exec(line))) {
currentFile.newFileMode = values[1];
} else if ((values = copyFrom.exec(line))) {
currentFile.oldName = values[1];
currentFile.isCopy = true;
} else if ((values = copyTo.exec(line))) {
currentFile.newName = values[1];
currentFile.isCopy = true;
} else if ((values = renameFrom.exec(line))) {
currentFile.oldName = values[1];
currentFile.isRename = true;
} else if ((values = renameTo.exec(line))) {
currentFile.newName = values[1];
currentFile.isRename = true;
} else if ((values = similarityIndex.exec(line))) {
currentFile.unchangedPercentage = values[1];
} else if ((values = dissimilarityIndex.exec(line))) {
currentFile.changedPercentage = values[1];
} else if ((values = index.exec(line))) {
currentFile.checksumBefore = values[1];
currentFile.checksumAfter = values[2];
values[2] && (currentFile.mode = values[3]);
} else if ((values = combinedIndex.exec(line))) {
currentFile.checksumBefore = [values[2], values[3]];
currentFile.checksumAfter = values[1];
} else if ((values = combinedMode.exec(line))) {
currentFile.oldMode = [values[2], values[3]];
currentFile.newMode = values[1];
} else if ((values = combinedNewFile.exec(line))) {
currentFile.newFileMode = values[1];
} else if ((values = combinedDeletedFile.exec(line))) {
currentFile.deletedFileMode = values[1];
} else if (currentBlock) {
createLine(line);
}
});
saveBlock();
saveFile();
return files;
};
function getExtension(filename, 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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* PrinterUtils (printer-utils.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
// dirty hack for browser compatibility
var jsDiff = (typeof JsDiff !== "undefined" && JsDiff) || require("diff");
2015-06-21 21:49:05 +00:00
var utils = require("./utils.js").Utils;
2015-05-03 13:09:07 +00:00
function PrinterUtils() {
}
PrinterUtils.prototype.getDiffName = function (file) {
var oldFilename = file.oldName;
var newFilename = file.newName;
if (oldFilename && newFilename
&& oldFilename !== newFilename
&& !isDeletedName(newFilename)) {
return oldFilename + " -> " + newFilename;
} else if (newFilename && !isDeletedName(newFilename)) {
return newFilename;
} else if (oldFilename) {
return oldFilename;
} else {
return "Unknown filename";
}
};
PrinterUtils.prototype.diffHighlight = function (diffLine1, diffLine2, config) {
var lineStart1, lineStart2;
var prefixSize = 1;
if (config.isCombined) prefixSize = 2;
lineStart1 = diffLine1.substr(0, prefixSize);
lineStart2 = diffLine2.substr(0, prefixSize);
diffLine1 = diffLine1.substr(prefixSize);
diffLine2 = diffLine2.substr(prefixSize);
var diff;
if (config.charByChar) diff = jsDiff.diffChars(diffLine1, diffLine2);
else diff = jsDiff.diffWordsWithSpace(diffLine1, diffLine2);
var highlightedLine = "";
diff.forEach(function (part) {
var elemType = part.added ? 'ins' : part.removed ? 'del' : null;
2015-06-21 21:49:05 +00:00
var escapedValue = utils.escape(part.value);
2015-05-03 13:09:07 +00:00
2015-06-21 21:49:05 +00:00
if (elemType !== null) highlightedLine += "<" + elemType + ">" + escapedValue + "</" + elemType + ">";
else highlightedLine += escapedValue;
2015-05-03 13:09:07 +00:00
});
return {
2015-05-31 22:07:23 +00:00
first: {
prefix: lineStart1,
line: removeIns(highlightedLine)
},
second: {
prefix: lineStart2,
line: removeDel(highlightedLine)
}
2015-05-03 13:09:07 +00:00
}
};
function isDeletedName(name) {
return name === "dev/null";
}
function removeIns(line) {
return line.replace(/(<ins>((.|\n)*?)<\/ins>)/g, "");
}
function removeDel(line) {
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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* HtmlPrinter (html-printer.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
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) {
var diffs;
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";
};
function generateSideBySideFileHtml(file, config) {
var fileHtml = {};
fileHtml.left = "";
fileHtml.right = "";
file.blocks.forEach(function (block) {
fileHtml.left += "<tr>\n" +
2015-05-31 22:07:23 +00:00
" <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";
2015-05-03 13:09:07 +00:00
fileHtml.right += "<tr>\n" +
2015-05-31 22:07:23 +00:00
" <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";
2015-05-03 13:09:07 +00:00
var oldLines = [], newLines = [];
var tmpHtml = "";
for (var i = 0; i < block.lines.length; i++) {
var line = block.lines[i];
var escapedLine = utils.escape(line.content);
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
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.right += generateSingleLineHtml(line.type, line.newNumber, escapedLine);
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
oldLines.push(line);
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
newLines.push(line);
} else {
var j = 0;
var oldLine, newLine;
if (oldLines.length === newLines.length) {
for (j = 0; j < oldLines.length; j++) {
oldLine = oldLines[j];
newLine = newLines[j];
config.isCombined = file.isCombined;
2015-06-21 21:49:05 +00:00
var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config);
2015-05-03 13:09:07 +00:00
2015-05-31 22:07:23 +00:00
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);
2015-05-03 13:09:07 +00:00
}
} else {
tmpHtml = processLines(oldLines, newLines);
fileHtml.left += tmpHtml.left;
fileHtml.right += tmpHtml.right;
}
oldLines = [];
newLines = [];
i--;
}
}
tmpHtml = processLines(oldLines, newLines);
fileHtml.left += tmpHtml.left;
fileHtml.right += tmpHtml.right;
});
return fileHtml;
}
function processLines(oldLines, newLines) {
var fileHtml = {};
fileHtml.left = "";
fileHtml.right = "";
var maxLinesNumber = Math.max(oldLines.length, newLines.length);
for (j = 0; j < maxLinesNumber; j++) {
var oldLine = oldLines[j];
var newLine = newLines[j];
if (oldLine && newLine) {
fileHtml.left += generateSingleLineHtml(oldLine.type, oldLine.oldNumber, utils.escape(oldLine.content));
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, "", "", "");
} else if (newLine) {
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?");
}
}
return fileHtml;
}
2015-05-31 22:07:23 +00:00
function generateSingleLineHtml(type, number, content, prefix) {
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>";
2015-05-03 13:09:07 +00:00
return "<tr>\n" +
" <td class=\"d2h-code-side-linenumber " + type + "\">" + number + "</td>\n" +
" <td class=\"" + type + "\">" +
2015-05-31 22:07:23 +00:00
" <div class=\"d2h-code-side-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
2015-05-03 13:09:07 +00:00
" </td>\n" +
" </tr>\n";
}
function generateEmptyDiff() {
var fileHtml = {};
fileHtml.right = "";
fileHtml.left = "<tr>\n" +
2015-05-31 22:07:23 +00:00
" <td class=\"" + diffParser.LINE_TYPE.INFO + "\">" +
" <div class=\"d2h-code-side-line " + diffParser.LINE_TYPE.INFO + "\">" +
"File without changes" +
" </div>" +
" </td>\n" +
"</tr>\n";
2015-05-03 13:09:07 +00:00
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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* LineByLinePrinter (line-by-line-printer.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
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) {
var diffs;
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";
};
function generateFileHtml(file, config) {
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 oldLines = [], newLines = [];
var processedOldLines = [], processedNewLines = [];
for (var i = 0; i < block.lines.length; i++) {
var line = block.lines[i];
var escapedLine = utils.escape(line.content);
if (line.type == diffParser.LINE_TYPE.CONTEXT && !oldLines.length && !newLines.length) {
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
} else if (line.type == diffParser.LINE_TYPE.INSERTS && !oldLines.length && !newLines.length) {
lines += generateLineHtml(line.type, line.oldNumber, line.newNumber, escapedLine);
} else if (line.type == diffParser.LINE_TYPE.DELETES && !newLines.length) {
oldLines.push(line);
} else if (line.type == diffParser.LINE_TYPE.INSERTS && oldLines.length > newLines.length) {
newLines.push(line);
} else {
var j = 0;
var oldLine, newLine;
if (oldLines.length === newLines.length) {
for (j = 0; j < oldLines.length; j++) {
oldLine = oldLines[j];
newLine = newLines[j];
config.isCombined = file.isCombined;
2015-06-21 21:49:05 +00:00
var diff = printerUtils.diffHighlight(oldLine.content, newLine.content, config);
2015-05-03 13:09:07 +00:00
2015-05-31 22:07:23 +00:00
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);
2015-05-03 13:09:07 +00:00
}
lines += processedOldLines + processedNewLines;
} else {
lines += processLines(oldLines, newLines);
}
oldLines = [];
newLines = [];
processedOldLines = [];
processedNewLines = [];
i--;
}
}
lines += processLines(oldLines, newLines);
return lines;
}).join("\n");
}
function processLines(oldLines, newLines) {
var lines = "";
for (j = 0; j < oldLines.length; j++) {
var oldLine = oldLines[j];
var oldEscapedLine = utils.escape(oldLine.content);
lines += generateLineHtml(oldLine.type, oldLine.oldNumber, oldLine.newNumber, oldEscapedLine);
}
for (j = 0; j < newLines.length; j++) {
var newLine = newLines[j];
var newEscapedLine = utils.escape(newLine.content);
lines += generateLineHtml(newLine.type, newLine.oldNumber, newLine.newNumber, newEscapedLine);
}
return lines;
}
2015-05-31 22:07:23 +00:00
function generateLineHtml(type, oldNumber, newNumber, content, prefix) {
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>";
2015-05-03 13:09:07 +00:00
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 + "\">" +
2015-05-31 22:07:23 +00:00
" <div class=\"d2h-code-line " + type + "\">" + htmlPrefix + htmlContent + "</div>" +
2015-05-03 13:09:07 +00:00
" </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";
}
// 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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* HtmlPrinter (html-printer.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
var lineByLinePrinter = require("./line-by-line-printer.js").LineByLinePrinter;
var sideBySidePrinter = require("./side-by-side-printer.js").SideBySidePrinter;
function HtmlPrinter() {
}
HtmlPrinter.prototype.generateLineByLineJsonHtml = lineByLinePrinter.generateLineByLineJsonHtml;
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();
2015-05-03 13:09:07 +00:00
})(this);
/*
*
* Diff to HTML (diff2html.js)
* Author: rtfpessoa
*
*/
(function (ctx, undefined) {
2015-05-03 13:09:07 +00:00
var diffParser = require("./diff-parser.js").DiffParser;
var htmlPrinter = require("./html-printer.js").HtmlPrinter;
function Diff2Html() {
}
/*
* Line diff type configuration
var config = {
"wordByWord": true, // (default)
// OR
"charByChar": true
};
2015-05-03 13:09:07 +00:00
*/
/*
* Generates pretty html from string diff input
*/
Diff2Html.prototype.getPrettyHtmlFromDiff = function (diffInput, config) {
var diffJson = diffParser.generateDiffJson(diffInput);
var configOrEmpty = config || {};
return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
};
/*
* Generates json object from string diff input
*/
Diff2Html.prototype.getJsonFromDiff = function (diffInput) {
return diffParser.generateDiffJson(diffInput);
};
/*
* Generates pretty html from a json object
*/
Diff2Html.prototype.getPrettyHtmlFromJson = function (diffJson, config) {
var configOrEmpty = config || {};
return htmlPrinter.generateLineByLineJsonHtml(diffJson, configOrEmpty);
};
/*
* Generates pretty side by side html from string diff input
*/
Diff2Html.prototype.getPrettySideBySideHtmlFromDiff = function (diffInput, config) {
var diffJson = diffParser.generateDiffJson(diffInput);
var configOrEmpty = config || {};
return htmlPrinter.generateSideBySideJsonHtml(diffJson, configOrEmpty);
};
/*
* Generates pretty side by side html from a json object
*/
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();
2015-05-03 13:09:07 +00:00
})(this);