Merge pull request #368 from azakus/text-normalize

Text normalize

Author: dfreedm

src/wrappers/Node.js

@@ -228,6 +228,13 @@
     return p && p.invalidateShadowRenderer();
   }
 
+  function cleanupNodes(nodes) {
+    for (var i = 0, n; i < nodes.length; i++) {
+      n = nodes[i];
+      n.parentNode.removeChild(n);
+    }
+  }
+
   var OriginalNode = window.Node;
 
   /**
@@ -629,6 +636,43 @@
       // This only wraps, it therefore only operates on the composed DOM and not
       // the logical DOM.
       return originalCompareDocumentPosition.call(this.impl, unwrap(otherNode));
+    },
+
+    normalize: function() {
+      var nodes = snapshotNodeList(this.childNodes);
+      var remNodes = [];
+      var s = '';
+      var modNode;
+
+      for (var i = 0, n; i < nodes.length; i++) {
+        n = nodes[i];
+        if (n.nodeType === Node.TEXT_NODE) {
+          if (!modNode && !n.data.length)
+            this.removeNode(n);
+          else if (!modNode)
+            modNode = n;
+          else {
+            s += n.data;
+            remNodes.push(n);
+          }
+        } else {
+          if (modNode && remNodes.length) {
+            modNode.data += s;
+            cleanUpNodes(remNodes);
+          }
+          remNodes = [];
+          s = '';
+          modNode = null;
+          if (n.childNodes.length)
+            n.normalize();
+        }
+      }
+
+      // handle case where >1 text nodes are the last children
+      if (modNode && remNodes.length) {
+        modNode.data += s;
+        cleanupNodes(remNodes);
+      }
     }
   });
 

test/js/Node.js

@@ -315,4 +315,48 @@ suite('Node', function() {
     assert.equal(div.textContent, 'abef');
   });
 
+  test('normalize', function() {
+    var div = document.createElement('div');
+    div.appendChild(document.createTextNode('foo\n'));
+    var span = document.createElement('span');
+    span.appendChild(document.createTextNode('buzz'));
+    span.appendChild(document.createTextNode('quux'));
+    div.appendChild(span);
+    div.appendChild(document.createTextNode('bar\n'));
+    assert.equal(div.textContent, 'foo\nbuzzquuxbar\n');
+
+    div.normalize();
+
+    assert.equal(div.textContent, 'foo\nbuzzquuxbar\n');
+    assert.equal(div.childNodes.length, 3);
+    assert.equal(div.firstChild.textContent, 'foo\n');
+    assert.equal(div.firstChild.nextSibling, span);
+    assert.equal(span.childNodes.length, 1);
+    assert.equal(span.firstChild.textContent, 'buzzquux');
+    assert.equal(span.nextSibling, div.lastChild);
+    assert.equal(div.lastChild.textContent, 'bar\n');
+
+  });
+
+  test('normalize with shadowroot', function() {
+    var div = document.createElement('div');
+    div.appendChild(document.createTextNode('foo\n'));
+    var sr = div.createShadowRoot();
+    sr.appendChild(document.createTextNode('buzz'));
+    sr.appendChild(document.createTextNode('quux'));
+    div.appendChild(document.createTextNode('bar\n'));
+    assert.equal(div.textContent, 'foo\nbar\n');
+    assert.equal(sr.textContent, 'buzzquux');
+
+    div.normalize();
+
+    assert.equal(div.textContent, 'foo\nbar\n');
+    assert.equal(sr.textContent, 'buzzquux');
+    assert.equal(div.childNodes.length, 1);
+    assert.equal(div.firstChild.textContent, 'foo\nbar\n');
+    assert.equal(sr.childNodes.length, 2);
+    assert.equal(sr.firstChild.textContent, 'buzz');
+    assert.equal(sr.firstChild.nextSibling.textContent, 'quux');
+  });
+
 });