r9966 - apps/gobi/trunk/code/Global
[email protected] Tue, 22 Sep 2009 19:37:52 +0200 (CEST)
| Newsgroups | gmane.comp.java.helma.cvs |
|---|---|
| Message-ID | <20090922173752.423C83D0E2@mia> |
Author: hannes
Date: 2009-09-22 19:37:52 +0200 (Tue, 22 Sep 2009)
New Revision: 9966
Modified:
apps/gobi/trunk/code/Global/Diff.js
Log:
Switch back to \W as intra-line diff separator.
Details at http://dev.helma.org/trac/helma/changeset/9966
Modified: apps/gobi/trunk/code/Global/Diff.js
===================================================================
--- apps/gobi/trunk/code/Global/Diff.js 2009-09-22 17:25:05 UTC (rev 9965)
+++ apps/gobi/trunk/code/Global/Diff.js 2009-09-22 17:37:52 UTC (rev 9966)
@@ -44,14 +44,14 @@
var length = Math.min(line.deleted.length, line.inserted.length);
for (var j = 0; j < length; j++) {
- var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\s"); // "[\\s<>=\"']");
+ var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\W"); // "[\\s<>=\"']");
for (var k in linediff) {
var word = linediff[k];
if (word.deleted) {
res.write(removed);
res.push();
- for (var l=0; l<word.deleted.length;l++) {
+ for (var l = 0; l < word.deleted.length; l++) {
res.write(word.deleted[l]);
}
res.write(diffEncode(res.pop()));
@@ -62,7 +62,7 @@
// res.write(" ");
res.write(added);
res.push();
- for (var l=0; l<word.inserted.length;l++) {
+ for (var l = 0; l < word.inserted.length; l++) {
res.write(word.inserted[l]);
}
res.write(diffEncode(res.pop()));
@@ -130,7 +130,7 @@
for (var j = 0; j < length; j++) {
table.add(parseInt(i) + parseInt(j) + 1, {style: numColStyle});
- var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\s"); // "[\\s<>=\"']");
+ var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\W"); // "[\\s<>=\"']");
res.push();
for (var k = 0; k < linediff.length; k++) {
var word = linediff[k];