add a fileKey option for upload param name

mycolorway · Aug 18, 2014 · 1a2d219 · 1a2d219
1 parent 407c9d2
commit 1a2d219
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 34 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/_data/configs.yml b/site/_data/configs.yml
@@ -72,6 +72,7 @@
 
     * `url` 文件上传的接口地址；
     * `params` 键值对，指定文件上传接口的额外参数，上传的时候随文件一起提交；
+    * `fileKey` 服务器端获取文件数据的参数名；
     * `connectionCount` 同时上传文件的最大数量；
     * `leaveConfirm` 在文件上传过程中离开页面时提醒的文案。
 
@@ -83,6 +84,7 @@
       upload:
         url: ''
         params: null
+        fileKey: 'upload_file'
         connectionCount: 3
         leaveConfirm: '正在上传文件，如果离开上传会自动取消'
     ```

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
@@ -92,15 +92,15 @@ class ImageButton extends Button
 
     createInput = =>
       $input.remove() if $input
-      $input = $('<input type="file" title="上传图片" name="upload_file" accept="image/*">')
+      $input = $('<input type="file" title="上传图片" accept="image/*">')
         .appendTo($uploadItem)
 
     createInput()
 
-    $uploadItem.on 'click mousedown', 'input[name=upload_file]', (e) =>
+    $uploadItem.on 'click mousedown', 'input[type=file]', (e) =>
       e.stopPropagation()
 
-    $uploadItem.on 'change', 'input[name=upload_file]', (e) =>
+    $uploadItem.on 'change', 'input[type=file]', (e) =>
       if @editor.inputManager.focused
         @editor.uploader.upload($input, {
           inline: true
@@ -369,15 +369,15 @@ class ImagePopover extends Popover
 
     createInput = =>
       @input.remove() if @input
-      @input = $('<input type="file" title="上传图片" name="upload_file" accept="image/*">')
+      @input = $('<input type="file" title="上传图片" accept="image/*">')
         .appendTo($uploadBtn)
 
     createInput()
 
-    @el.on 'click mousedown', 'input[name=upload_file]', (e) =>
+    @el.on 'click mousedown', 'input[type=file]', (e) =>
       e.stopPropagation()
 
-    @el.on 'change', 'input[name=upload_file]', (e) =>
+    @el.on 'change', 'input[type=file]', (e) =>
       @editor.uploader.upload(@input, {
         inline: true,
         img: @target

diff --git a/src/simditor.coffee b/src/simditor.coffee
@@ -2881,15 +2881,15 @@ class ImageButton extends Button
 
     createInput = =>
       $input.remove() if $input
-      $input = $('<input type="file" title="上传图片" name="upload_file" accept="image/*">')
+      $input = $('<input type="file" title="上传图片" accept="image/*">')
         .appendTo($uploadItem)
 
     createInput()
 
-    $uploadItem.on 'click mousedown', 'input[name=upload_file]', (e) =>
+    $uploadItem.on 'click mousedown', 'input[type=file]', (e) =>
       e.stopPropagation()
 
-    $uploadItem.on 'change', 'input[name=upload_file]', (e) =>
+    $uploadItem.on 'change', 'input[type=file]', (e) =>
       if @editor.inputManager.focused
         @editor.uploader.upload($input, {
           inline: true
@@ -3158,15 +3158,15 @@ class ImagePopover extends Popover
 
     createInput = =>
       @input.remove() if @input
-      @input = $('<input type="file" title="上传图片" name="upload_file" accept="image/*">')
+      @input = $('<input type="file" title="上传图片" accept="image/*">')
         .appendTo($uploadBtn)
 
     createInput()
 
-    @el.on 'click mousedown', 'input[name=upload_file]', (e) =>
+    @el.on 'click mousedown', 'input[type=file]', (e) =>
       e.stopPropagation()
 
-    @el.on 'change', 'input[name=upload_file]', (e) =>
+    @el.on 'change', 'input[type=file]', (e) =>
       @editor.uploader.upload(@input, {
         inline: true,
         img: @target