Merge pull request #53 from beyounic/bug-range-makers

Bug: cursor save/restore marker breaks normalizeTags()

Author: matteoagosti

spec/parser.spec.js

@@ -351,5 +351,13 @@ describe('Parser', function() {
     });
   });
 
-});
 
+  describe('latestChild()', function() {
+    it('returns the deepest last child', function() {
+      var source = linkWithSpan;
+      var target = document.createTextNode('bar');
+      expect(parser.latestChild(source).isEqualNode(target)).toEqual(true);
+    });
+  });
+
+});

src/behavior.js

@@ -119,7 +119,7 @@ var behavior = (function() {
         return;
 
       if(container.childNodes.length > 0)
-        cursor.moveAtEnd(container);
+        cursor.moveAtTextEnd(container);
       else
         cursor.moveAtBeginning(container);
       cursor.setSelection();
@@ -153,7 +153,7 @@ var behavior = (function() {
       case 'before':
         previous = block.previous(element);
         if (previous) {
-          cursor.moveAtEnd(previous);
+          cursor.moveAtTextEnd(previous);
           cursor.setSelection();
         }
         break;

src/cursor.js

@@ -147,6 +147,10 @@ var Cursor = (function() {
         if (this.isSelection) return new Cursor(this.host, this.range);
       },
 
+      moveAtTextEnd: function(element) {
+        return this.moveAtEnd(parser.latestChild(element));
+      },
+
       setHost: function(element) {
         this.host = parser.getHost(element);
         if (!this.host) {

src/parser.js

@@ -238,6 +238,20 @@ var parser = (function() {
       }
 
       return true;
+    },
+
+    /**
+     * Return the deepest last child of a node.
+     *
+     * @method  latestChild
+     * @param  {HTMLElement} container The container to iterate on.
+     * @return {HTMLElement}           THe deepest last child in the container.
+     */
+    latestChild: function(container) {
+      if(container.lastChild)
+        return this.latestChild(container.lastChild);
+      else
+        return container;
     }
   };
 })();