Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions diff.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,19 @@
return retLines;
};

return {
Diff: Diff,
var SentenceDiff = new Diff();
SentenceDiff.tokenize = function (value) {
return removeEmpty(value.split(/(\S.+?[.!?])(?=\s+|$)/));
};

return {
Diff: Diff,

diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
diffWordsWithSpace: function(oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
diffSentences: function(oldStr, newStr) { return SentenceDiff.diff(oldStr, newStr); },

diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },

Expand Down
13 changes: 13 additions & 0 deletions test/diffTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ describe('#diffWordsWithSpace', function() {
});
});

describe('#diffSentences', function() {

it('Should diff Sentences', function() {
var diffResult = diff.diffSentences('New Value.', 'New ValueMoreData.');
diff.convertChangesToXML(diffResult).should.equal('<ins>New ValueMoreData.</ins><del>New Value.</del>');
});

it('should diff only the last sentence', function() {
var diffResult = diff.diffSentences('Here im. Rock you like old man.', 'Here im. Rock you like hurricane.');
diff.convertChangesToXML(diffResult).should.equal('Here im. <ins>Rock you like hurricane.</ins><del>Rock you like old man.</del>');
});
});

// CSS Diff
describe('#diffCss', function() {
it('should diff css', function() {
Expand Down