CHG: edge support paste image

mycolorway · Aug 15, 2019 · 4eb1259 · 4eb1259
1 parent 9e992fb
commit 4eb1259
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -190,6 +190,7 @@ module.exports = (grunt) ->
         options:
           server: 'server.js'
           bases: '_site'
+          port: 3001
 
     uglify:
       simditor:

diff --git a/lib/simditor.js b/lib/simditor.js
@@ -1,7 +1,7 @@
 /*!
 * Simditor v2.3.27
 * http://simditor.tower.im/
-* 2019-07-30
+* 2019-08-15
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -2316,9 +2316,6 @@ Clipboard = (function(superClass) {
 
   Clipboard.prototype._processPasteByClipboardApi = function(e) {
     var imageFile, pasteItem, ref, uploadOpt;
-    if (this.editor.util.browser.edge) {
-      return;
-    }
     if (e.originalEvent.clipboardData && e.originalEvent.clipboardData.items && e.originalEvent.clipboardData.items.length > 0) {
       pasteItem = e.originalEvent.clipboardData.items[0];
       if (/^image\//.test(pasteItem.type)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.3.27",
+  "version": "2.3.28",
   "description": "A simple online editor",
   "repository": {
     "type": "git",

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -2311,9 +2311,6 @@ Clipboard = (function(superClass) {
 
   Clipboard.prototype._processPasteByClipboardApi = function(e) {
     var imageFile, pasteItem, ref, uploadOpt;
-    if (this.editor.util.browser.edge) {
-      return;
-    }
     if (e.originalEvent.clipboardData && e.originalEvent.clipboardData.items && e.originalEvent.clipboardData.items.length > 0) {
       pasteItem = e.originalEvent.clipboardData.items[0];
       if (/^image\//.test(pasteItem.type)) {

diff --git a/src/clipboard.coffee b/src/clipboard.coffee
@@ -51,9 +51,6 @@ class Clipboard extends SimpleModule
         @pasting = false
 
   _processPasteByClipboardApi: (e) ->
-    # clipboard api is buggy in MS Edge
-    return if @editor.util.browser.edge
-
     # paste file in chrome
     if e.originalEvent.clipboardData && e.originalEvent.clipboardData.items &&
         e.originalEvent.clipboardData.items.length > 0

diff --git a/styles/simditor.css b/styles/simditor.css
@@ -1,7 +1,7 @@
 /*!
 * Simditor v2.3.27
 * http://simditor.tower.im/
-* 2019-07-30
+* 2019-08-15
 */
 @font-face {
   font-family: 'Simditor';