fix for gaps based removal than addition

Author: johanneswilm

diffDOM.js

@@ -3,7 +3,7 @@
 
     var diffcount;
 
-    var Diff = function(options) {
+    var Diff = function (options) {
         var diff = this;
         Object.keys(options).forEach(function(option) {
             diff[option] = options[option];
@@ -67,7 +67,7 @@
 
     var elementDescriptors = function(el) {
         var output = [];
-        if (el.nodeName != '#text' && el.nodeName != '#comment') {
+        if (el.nodeName !== '#text' && el.nodeName !== '#comment') {
             output.push(el.nodeName);
             if (el.attributes) {
                 if (el.attributes.class) {
@@ -153,7 +153,7 @@
             e1Attributes = Object.keys(e1.attributes);
             e2Attributes = Object.keys(e2.attributes);
 
-            if (e1Attributes.length != e2Attributes.length) {
+            if (e1Attributes.length !== e2Attributes.length) {
                 return false;
             }
             if (!e1Attributes.every(function(attribute) {
@@ -821,20 +821,25 @@
                                     oldValue: node.data,
                                     newValue: t2.childNodes[i].data
                                 }));
+                                )
                             }
                         }
                         diffs.push(new Diff({
                             action: 'removeTextElement',
                             route: route.concat(index),
                             value: node.data
                         }));
+                        gaps1.splice(index, 1);
+                        shortest = Math.min(gaps1.length, gaps2.length);
                         index -= 1;
                     } else {
                         diffs.push(new Diff({
                             action: 'removeElement',
                             route: route.concat(index),
                             element: cloneObj(node)
                         }));
+                        gaps1.splice(index, 1);
+                        shortest = Math.min(gaps1.length, gaps2.length);
                         index -= 1;
                     }
 

tests/basic.html

@@ -23,6 +23,8 @@
   <h1>Test for diffDOM</h1>
 
   <!-- Add all divs to be compared here two by two -->
+
+
   <div><img><p></p><i></i><img></div>
   <div><img><p>a</p><i></i><img><p></p></div>
 
@@ -567,6 +569,12 @@ <h1>Test for diffDOM</h1>
       objToNode(JSON.parse('{"nn":"DIV","a":[["id","document-editable"]],"c":[{"nn":"DIV","a":[["id","document-title"],["class","editable user-contents"],["title","The title of the document"],["contenteditable","true"]],"c":[{"t":"Hellofglalak"}]},{"nn":"DIV","a":[["id","document-metadata"],["class","user-contents"]]},{"nn":"DIV","a":[["id","document-contents"],["class","editable user-contents"],["contenteditable","true"]],"c":[{"nn":"P","c":[{"t":"I want a new Finisky is a German writer. Finish laundromats. French steel plants kate -- spiegel overrated. Howe"},{"t":"ver, the essential parts are good Danish roses. And Swedish steel. Bitcoin Claustrophobic Visions (BCC). Aftenposten regner, bicycle. It\'s really easy to do.  University finals are a discipline of their own. Bortsch ist something I would like to eat during winter. fellxDAGBBloneHONEZDzow. And so thdededeey went to M"},{"nn":"SPAN","a":[["class","comment"],["id","comment-0"],["data-id","0"],["data-user","1"],["data-user-name","johannes"],["data-user-avatar","/static/img/default_avatar.png"],["data-date","1388568971084"],["data-comment","test"]],"c":[{"t":"unichmel"}]},{"t":"lom "},{"nn":"SPAN","a":[["class","citation"],["data-bib-entry","1"],["data-bib-before",""],["data-bib-page","123"],["data-bib-format","autocite"]]},{"t":" jfllfrjc"},{"nn":"SPAN","a":[["class","equation"],["data-equation","\\frac{2}{3}"]]},{"t":" aftfellowen"},{"nn":"SPAN","a":[["class","equation"],["data-equation","x=2*y"]]},{"t":" deAftend"},{"nn":"SPAN","a":[["class","equation"],["data-equation","x=2*y"]]},{"t":" etigeren"}]},{"nn":"P","c":[{"t":"lalalalala"},{"nn":"SPAN","a":[["class","footnote"]],"c":[{"t":"a footnote "},{"nn":"BR"}]},{"t":"dsdfdsfllasdsBerchtesgardener Lichtspiele. Flensburger Nahverkehr.qwedw casdsdwqqw"}]}]}]}')),
     ]);
 
+    divs = divs.concat([
+      objToNode(JSON.parse('{"nn":"DIV","c":[{"nn":"B"},{"nn":"I"},{"nn":"I"},{"t":"1"}]}')),
+      objToNode(JSON.parse('{"nn":"DIV","c":[{"nn":"B"},{"nn":"I"},{"t":"1"},{"t":"2"}]}')),
+    ]);
+
+
 
     for (i = 0; i < divs.length; i = i + 2) {
 

tests/random-unlimited.html

@@ -28,6 +28,32 @@
         tl = new TraceLogger(dd),
         divs, diffs, t1, i, j, availableElements, testElement, textContent, mainDiv = document.createElement('div');
 
+
+      function nodeToObj(node) {
+        var objNode = {}, i;
+
+        if (node.nodeType === 3) {
+          objNode.t = node.data;
+        } else if (node.nodeType === 8) {
+          objNode.co = node.data;
+        } else {
+          objNode.nn = node.nodeName;
+          if (node.attributes && node.attributes.length > 0) {
+            objNode.a = [];
+            for (i = 0; i < node.attributes.length; i++) {
+              objNode.a.push([node.attributes[i].name, node.attributes[i].value]);
+            }
+          }
+          if (node.childNodes && node.childNodes.length > 0) {
+            objNode.c = [];
+            for (i = 0; i < node.childNodes.length; i++) {
+              objNode.c.push(nodeToObj(node.childNodes[i]));
+            }
+          }
+        }
+        return objNode;
+      }
+
       function reportDiv() {
         document.body.appendChild(document.createElement('div'));
       }
@@ -108,6 +134,8 @@
             print(diffs);
             print(t1.outerHTML);
             print(divs[i + 1].outerHTML);
+            print(JSON.stringify(nodeToObj(divs[i])));
+            print(JSON.stringify(nodeToObj(divs[i+1])));
             throw 'Outputs not matching';
           }
 
@@ -122,6 +150,8 @@
             print(diffs);
             print(t1.outerHTML);
             print(divs[i].outerHTML);
+            print(JSON.stringify(nodeToObj(divs[i])));
+            print(JSON.stringify(nodeToObj(divs[i+1])));
             throw 'Outputs not matching';
           }
           //try{