Fix noop check to compare with native range nodes

Fixes #1195
slab · Dec 23, 2016 · 154f2b4 · 154f2b4
1 parent 555f872
commit 154f2b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/core/quill.js b/core/quill.js
@@ -401,10 +401,6 @@ function modify(modifier, source, index, shift) {
     } else if (shift !== 0) {
       range = shiftRange(range, index, shift, source);
     }
-    if (range.index === 0 && range.length === 0) {
-      // Fixes cursor render bug in Chrome for code-block and checklist
-      this.setSelection(null, Emitter.sources.SILENT);
-    }
     this.setSelection(range, Emitter.sources.SILENT);
   }
   if (change.length() > 0) {

diff --git a/core/selection.js b/core/selection.js
@@ -217,10 +217,10 @@ class Selection {
     if (selection == null) return;
     if (startNode != null) {
       if (!this.hasFocus()) this.root.focus();
-      let nativeRange = this.getNativeRange();
-      if (nativeRange == null || force ||
-          startNode !== nativeRange.start.node || startOffset !== nativeRange.start.offset ||
-          endNode !== nativeRange.end.node || endOffset !== nativeRange.end.offset) {
+      let native = (this.getNativeRange() || {}).native;
+      if (native == null || force ||
+          startNode !== native.startContainer || startOffset !== native.startOffset ||
+          endNode !== native.endContainer || endOffset !== native.endOffset) {
         let range = document.createRange();
         range.setStart(startNode, startOffset);
         range.setEnd(endNode, endOffset);