fix tests for phantomjs

slab · Oct 26, 2014 · 0a669f0 · 0a669f0
1 parent c1f9f6f
commit 0a669f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/core/editor.coffee b/src/core/editor.coffee
@@ -71,7 +71,7 @@ class Editor
 
   focus: ->
     @selection.setRange(@selection.range) if dom.isIE(11)
-    @renderer.iframe.focus() if dom.isIOS()
+    @renderer.iframe.focus()
     @root.focus()
 
   getDelta: ->

diff --git a/src/core/selection.coffee b/src/core/selection.coffee
@@ -144,7 +144,9 @@ class Selection
     return unless selection
     if startNode?
       # Some reason need to focus before removing ranges otherwise cannot set them
-      @doc.root.focus() unless this.checkFocus()
+      unless this.checkFocus()
+        @iframe.focus()
+        @doc.root.focus()
       nativeRange = this._getNativeRange()
       if !nativeRange? or startNode != nativeRange.startContainer or startOffset != nativeRange.startOffset or endNode != nativeRange.endContainer or endOffset != nativeRange.endOffset
         # IE9 requires removeAllRanges() regardless of value of

diff --git a/test/unit/core/selection.coffee b/test/unit/core/selection.coffee
@@ -309,7 +309,7 @@ describe('Selection', ->
         expect(savedRange.end).toEqual(3)
         @quill.focus()
         range = @quill.getSelection()
-        expect(range).toBeTruthy()
+        expect(range).not.toEqual(null)
         expect(range.start).toEqual(2)
         expect(range.end).toEqual(3)
         done()