r9965 - apps/gobi/trunk/code/Global

Author: hannes
Date: 2009-09-22 19:25:05 +0200 (Tue, 22 Sep 2009)
New Revision: 9965

Modified:
   apps/gobi/trunk/code/Global/Diff.js
Log:
Minor tweaks and cleanup

Details at http://dev.helma.org/trac/helma/changeset/9965

Modified: apps/gobi/trunk/code/Global/Diff.js
===================================================================
--- apps/gobi/trunk/code/Global/Diff.js	2009-09-22 17:23:16 UTC (rev 9964)
+++ apps/gobi/trunk/code/Global/Diff.js	2009-09-22 17:25:05 UTC (rev 9965)
@@ -43,8 +43,8 @@
       if (line.deleted && line.inserted) {
         
         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], "\\W"); // "[\\s<>=\"']");
+        for (var j = 0; j < length; j++) {
+           var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\s"); // "[\\s<>=\"']");
            
            for (var k in linediff) {
              var word = linediff[k];
@@ -76,7 +76,7 @@
         }
         // write out remaining lines
         if (line.deleted) {
-          for (var j=length; j<line.deleted.length; j++)
+          for (var j = length; j < line.deleted.length; j++)
             res.writeln(removed + diffEncode(line.deleted[j]) + "</span><br />");
         }
         if (line.inserted) {
@@ -84,10 +84,10 @@
             res.writeln(added + diffEncode(line.inserted[j]) + "</span><br />");
         }
       } else if (line.deleted) {
-        for (var j=0;j<line.deleted.length;j++)
+        for (var j = 0; j < line.deleted.length; j++)
           res.writeln(removed + diffEncode(line.deleted[j]) + "</span><br />");
       } else if (line.inserted) {
-        for (var j=0;j<line.inserted.length;j++)
+        for (var j = 0; j < line.inserted.length; j++)
           res.writeln(added + diffEncode(line.inserted[j]) + "</span><br />");
       } else if (line.value != null) {
         res.writeln("<span>" + diffEncode(line.value) + "</span><br />");
@@ -119,7 +119,7 @@
     var added = DIFF_STYLE_ADDED;
 
     res.write("<div class='diffbody'>");
-    var numColStyle ="width:2em; color:#999;";
+    var numColStyle ="width:2em; color:#999; vertical-align: top;";
 
     var table = new Html.TableBuilder(2);
     for (var i = 0; i < diff.length; i++) {
@@ -130,14 +130,14 @@
         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], "\\W"); // "[\\s<>=\"']");
+           var linediff = getDiffs(line.deleted[j], line.inserted[j], "\\s"); // "[\\s<>=\"']");
            res.push();
            for (var k = 0; k < linediff.length; k++) {
              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()));
@@ -146,7 +146,7 @@
              if (word.inserted) {
                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()));
@@ -210,15 +210,15 @@
    // create the Diff object
    var diff = new Packages.helma.util.Diff(str1, str2);
    // get the diff.
-   var d = diff.diff();
-   if (!d && splitByLines)
+   var delta = diff.diff();
+   if (!delta && splitByLines)
        return null;
 
    var result = [];
    var max = Math.max(str1.length, str2.length);
    var previous = null;
    for (var i = 0; i < max; i++) {
-       if (!d || i < d.line1) {
+       if (!delta || i < delta.line1) {
            if (typeof(str2[i]) == "undefined")
                continue;
            if (previous)
@@ -230,23 +230,23 @@
                if (splitByLines)
                    previous = null;
            }
-       } else if (d) {
+       } else if (delta) {
            var line = { num: i + 1 };
-           if (d.deleted) {
+           if (delta.deleted) {
                var del = new Array();
-               for (var j = d.line0; j < d.line0 + d.deleted; j++)
+               for (var j = delta.line0; j < delta.line0 + delta.deleted; j++)
                    del.push(str1[j]);
                line.deleted = del;
            }
-           if (d.inserted) {
+           if (delta.inserted) {
                var ins = new Array();
-               for (var j=d.line1; j<d.line1+d.inserted; j++)
+               for (var j = delta.line1; j < delta.line1 + delta.inserted; j++)
                    ins.push(str2[j]);
                line.inserted = ins;
            }
            result.push(line);
-           i = d.line1 + d.inserted - 1;
-           d = d.link;
+           i = delta.line1 + delta.inserted - 1;
+           delta = delta.link;
            previous = null;
       }
    }
@@ -308,7 +308,6 @@
  */
 function objectDiff(obj1, obj2) {
     var diff = {removed: [], changed: [], added: []};
-    var propname = {};
     for (var i in obj1) {
         // HACK exclude password related stuff
         if (String(i).indexOf("password") == 0 || obj1[i] == obj2[i])