Skip to content

Commit 2d037b3

Browse files
matteosuppomatteosuppo
committed
Create filter and tests
1 parent cc0acd2 commit 2d037b3

File tree

3 files changed

+354
-0
lines changed

3 files changed

+354
-0
lines changed

‎src/diff.filter.js‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
'use strict';
2+
3+
angular.module('diff', [])
4+
.filter('diff', function () {
5+
6+
/*
7+
* Javascript Diff Algorithm
8+
* By John Resig (http://ejohn.org/)
9+
* Modified by Chu Alan 'sprite'
10+
*
11+
* Released under the MIT license.
12+
*
13+
* More Info:
14+
* http://ejohn.org/projects/javascript-diff-algorithm/
15+
*/
16+
17+
function escape(s) {
18+
var n = s;
19+
n = n.replace(/&/g, '&');
20+
n = n.replace(/</g, '&lt;');
21+
n = n.replace(/>/g, '&gt;');
22+
n = n.replace(/'/g, '&quot;');
23+
24+
return n;
25+
}
26+
27+
function diffString( o, n ) {
28+
o = o.replace(/\s+$/, '');
29+
n = n.replace(/\s+$/, '');
30+
31+
var out = diff(o === '' ? [] : o.split(/\s+/), n === '' ? [] : n.split(/\s+/) );
32+
var str = '';
33+
var i;
34+
35+
var oSpace = o.match(/\s+/g);
36+
if (oSpace === null) {
37+
oSpace = ['\n'];
38+
} else {
39+
oSpace.push('\n');
40+
}
41+
var nSpace = n.match(/\s+/g);
42+
if (nSpace === null) {
43+
nSpace = ['\n'];
44+
} else {
45+
nSpace.push('\n');
46+
}
47+
48+
if (out.n.length === 0) {
49+
for (i = 0; i < out.o.length; i++) {
50+
str += '<del>' + escape(out.o[i]) + oSpace[i] + '</del>';
51+
}
52+
} else {
53+
if (out.n[0].text === null) {
54+
for (n = 0; n < out.o.length && out.o[n].text === null; n++) {
55+
str += '<del>' + escape(out.o[n]) + oSpace[n] + '</del>';
56+
}
57+
}
58+
59+
for (i = 0; i < out.n.length; i++ ) {
60+
if (!out.n[i].text) {
61+
str += '<ins>' + escape(out.n[i]) + nSpace[i] + '</ins>';
62+
} else {
63+
var pre = '';
64+
65+
for (n = out.n[i].row + 1; n < out.o.length && !out.o[n].text; n++ ) {
66+
pre += '<del>' + escape(out.o[n]) + oSpace[n] + '</del>';
67+
}
68+
str += ' ' + out.n[i].text + nSpace[i] + pre;
69+
}
70+
}
71+
}
72+
73+
return str;
74+
}
75+
76+
function randomColor() {
77+
return 'rgb(' + (Math.random() * 100) + '%, ' +
78+
(Math.random() * 100) + '%, ' +
79+
(Math.random() * 100) + '%)';
80+
}
81+
82+
function diffString2( o, n ) {
83+
var i;
84+
85+
o = o.replace(/\s+$/, '');
86+
n = n.replace(/\s+$/, '');
87+
88+
var out = diff(o === '' ? [] : o.split(/\s+/), n === '' ? [] : n.split(/\s+/) );
89+
90+
var oSpace = o.match(/\s+/g);
91+
if (!oSpace) {
92+
oSpace = ['\n'];
93+
} else {
94+
oSpace.push('\n');
95+
}
96+
var nSpace = n.match(/\s+/g);
97+
if (!nSpace) {
98+
nSpace = ['\n'];
99+
} else {
100+
nSpace.push('\n');
101+
}
102+
103+
var os = '';
104+
var colors = [];
105+
for (i = 0; i < out.o.length; i++) {
106+
colors[i] = randomColor();
107+
108+
if (out.o[i].text) {
109+
os += '<span style="background-color: ' +colors[i]+ '">' +
110+
escape(out.o[i].text) + oSpace[i] + '</span>';
111+
} else {
112+
os += '<del>' + escape(out.o[i]) + oSpace[i] + '</del>';
113+
}
114+
}
115+
116+
var ns = '';
117+
for (i = 0; i < out.n.length; i++) {
118+
if (out.n[i].text) {
119+
ns += '<span style="background-color: ' +colors[out.n[i].row]+ '">' +
120+
escape(out.n[i].text) + nSpace[i] + '</span>';
121+
} else {
122+
ns += '<ins>' + escape(out.n[i]) + nSpace[i] + '</ins>';
123+
}
124+
}
125+
126+
return { o : os , n : ns };
127+
}
128+
129+
function diff( o, n ) {
130+
var ns = {};
131+
var os = {};
132+
var i;
133+
134+
for (i = 0; i < n.length; i++ ) {
135+
if ( !ns[ n[i] ] ) {
136+
ns[ n[i] ] = { rows: [], o: null };
137+
}
138+
ns[ n[i] ].rows.push( i );
139+
}
140+
141+
for (i = 0; i < o.length; i++ ) {
142+
if ( !os[ o[i] ] ){
143+
os[ o[i] ] = { rows: [], n: null };
144+
}
145+
os[ o[i] ].rows.push( i );
146+
}
147+
148+
for (i in ns ) {
149+
if ( ns[i].rows.length === 1 && typeof(os[i]) !== 'undefined' && os[i].rows.length === 1 ) {
150+
n[ ns[i].rows[0] ] = { text: n[ ns[i].rows[0] ], row: os[i].rows[0] };
151+
o[ os[i].rows[0] ] = { text: o[ os[i].rows[0] ], row: ns[i].rows[0] };
152+
}
153+
}
154+
155+
for (i = 0; i < n.length - 1; i++ ) {
156+
if ( n[i].text !== null && n[i+1].text === null && n[i].row + 1 < o.length && !o[ n[i].row + 1 ].text &&
157+
n[i+1] === o[ n[i].row + 1 ] ) {
158+
n[i+1] = { text: n[i+1], row: n[i].row + 1 };
159+
o[n[i].row+1] = { text: o[n[i].row+1], row: i + 1 };
160+
}
161+
}
162+
163+
for (i = n.length - 1; i > 0; i-- ) {
164+
if ( n[i].text && !n[i-1].text && n[i].row > 0 && !o[ n[i].row - 1 ].text &&
165+
n[i-1] === o[ n[i].row - 1 ] ) {
166+
n[i-1] = { text: n[i-1], row: n[i].row - 1 };
167+
o[n[i].row-1] = { text: o[n[i].row-1], row: i - 1 };
168+
}
169+
}
170+
171+
return { o: o, n: n };
172+
}
173+
174+
// Actual filter
175+
return function(input, match) {
176+
return diffString(input, match);
177+
};
178+
});

‎src/diff.js‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
/*
2+
* Javascript Diff Algorithm
3+
* By John Resig (http://ejohn.org/)
4+
* Modified by Chu Alan "sprite"
5+
*
6+
* Released under the MIT license.
7+
*
8+
* More Info:
9+
* http://ejohn.org/projects/javascript-diff-algorithm/
10+
*/
11+
12+
function escape(s) {
13+
var n = s;
14+
n = n.replace(/&/g, "&amp;");
15+
n = n.replace(/</g, "&lt;");
16+
n = n.replace(/>/g, "&gt;");
17+
n = n.replace(/"/g, "&quot;");
18+
19+
return n;
20+
}
21+
22+
function diffString( o, n ) {
23+
o = o.replace(/\s+$/, '');
24+
n = n.replace(/\s+$/, '');
25+
26+
var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) );
27+
var str = "";
28+
29+
var oSpace = o.match(/\s+/g);
30+
if (oSpace == null) {
31+
oSpace = ["\n"];
32+
} else {
33+
oSpace.push("\n");
34+
}
35+
var nSpace = n.match(/\s+/g);
36+
if (nSpace == null) {
37+
nSpace = ["\n"];
38+
} else {
39+
nSpace.push("\n");
40+
}
41+
42+
if (out.n.length == 0) {
43+
for (var i = 0; i < out.o.length; i++) {
44+
str += '<del>' + escape(out.o[i]) + oSpace[i] + "</del>";
45+
}
46+
} else {
47+
if (out.n[0].text == null) {
48+
for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
49+
str += '<del>' + escape(out.o[n]) + oSpace[n] + "</del>";
50+
}
51+
}
52+
53+
for ( var i = 0; i < out.n.length; i++ ) {
54+
if (out.n[i].text == null) {
55+
str += '<ins>' + escape(out.n[i]) + nSpace[i] + "</ins>";
56+
} else {
57+
var pre = "";
58+
59+
for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
60+
pre += '<del>' + escape(out.o[n]) + oSpace[n] + "</del>";
61+
}
62+
str += " " + out.n[i].text + nSpace[i] + pre;
63+
}
64+
}
65+
}
66+
67+
return str;
68+
}
69+
70+
function randomColor() {
71+
return "rgb(" + (Math.random() * 100) + "%, " +
72+
(Math.random() * 100) + "%, " +
73+
(Math.random() * 100) + "%)";
74+
}
75+
function diffString2( o, n ) {
76+
o = o.replace(/\s+$/, '');
77+
n = n.replace(/\s+$/, '');
78+
79+
var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) );
80+
81+
var oSpace = o.match(/\s+/g);
82+
if (oSpace == null) {
83+
oSpace = ["\n"];
84+
} else {
85+
oSpace.push("\n");
86+
}
87+
var nSpace = n.match(/\s+/g);
88+
if (nSpace == null) {
89+
nSpace = ["\n"];
90+
} else {
91+
nSpace.push("\n");
92+
}
93+
94+
var os = "";
95+
var colors = new Array();
96+
for (var i = 0; i < out.o.length; i++) {
97+
colors[i] = randomColor();
98+
99+
if (out.o[i].text != null) {
100+
os += '<span style="background-color: ' +colors[i]+ '">' +
101+
escape(out.o[i].text) + oSpace[i] + "</span>";
102+
} else {
103+
os += "<del>" + escape(out.o[i]) + oSpace[i] + "</del>";
104+
}
105+
}
106+
107+
var ns = "";
108+
for (var i = 0; i < out.n.length; i++) {
109+
if (out.n[i].text != null) {
110+
ns += '<span style="background-color: ' +colors[out.n[i].row]+ '">' +
111+
escape(out.n[i].text) + nSpace[i] + "</span>";
112+
} else {
113+
ns += "<ins>" + escape(out.n[i]) + nSpace[i] + "</ins>";
114+
}
115+
}
116+
117+
return { o : os , n : ns };
118+
}
119+
120+
function diff( o, n ) {
121+
var ns = new Object();
122+
var os = new Object();
123+
124+
for ( var i = 0; i < n.length; i++ ) {
125+
if ( ns[ n[i] ] == null )
126+
ns[ n[i] ] = { rows: new Array(), o: null };
127+
ns[ n[i] ].rows.push( i );
128+
}
129+
130+
for ( var i = 0; i < o.length; i++ ) {
131+
if ( os[ o[i] ] == null )
132+
os[ o[i] ] = { rows: new Array(), n: null };
133+
os[ o[i] ].rows.push( i );
134+
}
135+
136+
for ( var i in ns ) {
137+
if ( ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1 ) {
138+
n[ ns[i].rows[0] ] = { text: n[ ns[i].rows[0] ], row: os[i].rows[0] };
139+
o[ os[i].rows[0] ] = { text: o[ os[i].rows[0] ], row: ns[i].rows[0] };
140+
}
141+
}
142+
143+
for ( var i = 0; i < n.length - 1; i++ ) {
144+
if ( n[i].text != null && n[i+1].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
145+
n[i+1] == o[ n[i].row + 1 ] ) {
146+
n[i+1] = { text: n[i+1], row: n[i].row + 1 };
147+
o[n[i].row+1] = { text: o[n[i].row+1], row: i + 1 };
148+
}
149+
}
150+
151+
for ( var i = n.length - 1; i > 0; i-- ) {
152+
if ( n[i].text != null && n[i-1].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&
153+
n[i-1] == o[ n[i].row - 1 ] ) {
154+
n[i-1] = { text: n[i-1], row: n[i].row - 1 };
155+
o[n[i].row-1] = { text: o[n[i].row-1], row: i - 1 };
156+
}
157+
}
158+
159+
return { o: o, n: n };
160+
}

‎tests/diff.filter.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
describe('filter', function() {
4+
5+
beforeEach(module('diff'));
6+
7+
describe('checkmark', function() {
8+
9+
it('should convert a string to the diff value with another string', inject(function(diffFilter) {
10+
expect(diffFilter(
11+
'The red brown fox jumped over the rolling log.',
12+
'The brown spotted fox leaped over the rolling log')).toBe(
13+
' The <del>red </del> brown <ins>spotted </ins> fox <del>jumped </del><ins>leaped </ins> over the rolling <del>log.\n</del><ins>log\n</ins>');
14+
}));
15+
});
16+
});

0 commit comments

Comments
 (0)