fix image positioning

fixes #670
slab · May 16, 2016 · 4b5a815 · 4b5a815
1 parent 1ee65b1
commit 4b5a815
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/core/selection.js b/core/selection.js
@@ -151,13 +151,14 @@ class Selection {
           offset = 0;
         } else if (node.childNodes.length === offset) {
           node = node.lastChild;
-          offset = node instanceof Text ? node.data.length : node.childNodes.length;
+          offset = node instanceof Text ? node.data.length : node.childNodes.length + 1;
         } else {
           break;
         }
       }
       position.node = node, position.offset = offset;
     });
+    debug.info('getNativeRange', range);
     return range;
   }
 

diff --git a/modules/image-tooltip.js b/modules/image-tooltip.js
@@ -54,6 +54,7 @@ class ImageTooltip extends Module {
     let index = range.index + range.length;
     this.quill.insertEmbed(index, ImageBlot.blotName, this.textbox.value, Quill.sources.USER);
     this.quill.setSelection(index + 1, Quill.sources.SILENT);
+    this.textbox.value = '';
     this.hide();
   }
 

diff --git a/test/unit/core/selection.js b/test/unit/core/selection.js
@@ -203,6 +203,17 @@ describe('Selection', function() {
       expect(selection.hasFocus()).toBe(true);
     });
 
+    it('single embed', function() {
+      let selection = this.initialize(Selection,
+        `<p><img src="/assets/favicon.png"></p>`
+      );
+      let expected = new Range(1, 0);
+      selection.setRange(expected);
+      let [range, ] = selection.getRange();
+      expect(range).toEqual(expected);
+      expect(selection.hasFocus()).toBe(true);
+    });
+
     it('between embeds', function() {
       let selection = this.initialize(Selection, `
         <p>