IE 11 support paste upload image

shawjia · Apr 29, 2014 · 340c0bb · 340c0bb
1 parent c9087c0
commit 340c0bb
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/lib/simditor-all.js b/lib/simditor-all.js
diff --git a/lib/simditor.js b/lib/simditor.js
diff --git a/site/assets/scripts/simditor-all.js b/site/assets/scripts/simditor-all.js
diff --git a/src/buttons/image.coffee b/src/buttons/image.coffee
@@ -260,6 +260,12 @@ class ImageButton extends Button
 
   createImage: () ->
     range = @editor.selection.getRange()
+
+    unless range
+      caret = @editor.inputManager.lastCaretPosition
+      @editor.undoManager.caretPosition caret
+      range = @editor.selection.getRange()
+
     startNode = range.startContainer
     endNode = range.endContainer
     $startBlock = @editor.util.closestBlockEl(startNode)

diff --git a/src/inputManager.coffee b/src/inputManager.coffee
@@ -244,11 +244,11 @@ class InputManager extends Plugin
           children = pasteContent.contents()
           @editor.selection.insertNode node, range for node in children
 
-        # paste image in firefox
+        # paste image in firefox and IE 11
         else if pasteContent.is('.simditor-image')
           $img = pasteContent.find('img')
 
-          # firefox
+          # firefox and IE 11
           if dataURLtoBlob && $img.is('img[src^="data:image/png;base64"]')
             return unless @opts.pasteImage
             blob = dataURLtoBlob $img.attr( "src" )

diff --git a/src/simditor.coffee b/src/simditor.coffee
@@ -612,11 +612,11 @@ class InputManager extends Plugin
           children = pasteContent.contents()
           @editor.selection.insertNode node, range for node in children
 
-        # paste image in firefox
+        # paste image in firefox and IE 11
         else if pasteContent.is('.simditor-image')
           $img = pasteContent.find('img')
 
-          # firefox
+          # firefox and IE 11
           if dataURLtoBlob && $img.is('img[src^="data:image/png;base64"]')
             return unless @opts.pasteImage
             blob = dataURLtoBlob $img.attr( "src" )
@@ -2738,6 +2738,12 @@ class ImageButton extends Button
 
   createImage: () ->
     range = @editor.selection.getRange()
+
+    unless range
+      caret = @editor.inputManager.lastCaretPosition
+      @editor.undoManager.caretPosition caret
+      range = @editor.selection.getRange()
+
     startNode = range.startContainer
     endNode = range.endContainer
     $startBlock = @editor.util.closestBlockEl(startNode)