dom: nodeIterator

alexmerfi · May 20, 2013 · a4b1ab1 · a4b1ab1
1 parent 96f7222
commit a4b1ab1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/summernote.js b/summernote.js
@@ -78,7 +78,7 @@
     var commonAncestor = function(nodeA, nodeB) {
       var aAncestor = listAncestor(nodeA);
       for (var n = nodeB; n; n = n.parentNode) {
-        //TODO: IE8 there is no indexOf
+        //TODO: IE8, indexOf
         if (aAncestor.indexOf(n) != -1) { return n; }
       }
 
@@ -90,8 +90,20 @@
      * listing all Nodes between nodeA and nodeB
      */
     var listBetween = function(nodeA, nodeB) {
+      //FIXME: must nodeA and nodeB be sorted, use comparePoints later.
+      var aNode = [];
       var elAncestor = commonAncestor(nodeA, nodeB);
-      return [nodeA];
+      //TODO: IE8, createNodeIterator
+      var iterator = document.createNodeIterator(elAncestor,
+                                                 NodeFilter.SHOW_ALL, null,
+                                                 false);
+      var node, bStart = false;
+      while (node = iterator.nextNode()) {
+        if (nodeA === node) { bStart = true; }
+        if (bStart) { aNode.push(node); }
+        if (nodeB === node) { break; }
+      }
+      return aNode;
     };
 
     return {

diff --git a/test/dom.spec.js b/test/dom.spec.js
@@ -54,5 +54,9 @@ test('dom.listBetween', function() {
   $s = $cont.find('s'), $i = $cont.find('i');
 
   deepEqual(dom.listBetween($b[0], $b[0]), [$b[0]], 'same elements');
-  //deepEqual(dom.listBetween($b[0], $u[0]), [$b[0], $u[0]], 'nextSibling');
+  deepEqual(dom.listBetween($b[0], $u[0]), [$b[0], $b[0].firstChild, $u[0]], 'adjacent');
+  deepEqual(dom.listBetween($b[0], $u[0]), [$b[0], $b[0].firstChild, $u[0]], 'distance 2');
+  deepEqual(dom.listBetween($b[0], $s[0]), [$b[0], $b[0].firstChild,
+                                            $u[0], $u[0].firstChild,
+                                            $s[0]], 'distance 2');
 });