Skip to content

Commit 13f0502

Browse files
committed
初始化选项增加headers参数
1 parent 83ba979 commit 13f0502

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ __url__
4545

4646
上传接口地址,必选。
4747

48+
__headers__ (新增)
49+
50+
json对象,上传请求的头部信息,可选
51+
4852
__params__
4953

5054
hash对象,上传请求附带的参数,可选
@@ -110,5 +114,3 @@ __uploadcomplete__ (e, file, responseText)
110114
__uploadcancel__ (e, file)
111115

112116
调用uploader.cancel()方法取消上传的时候会触发这个事件
113-
114-

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simple-uploader",
3-
"version": "2.0.8",
3+
"version": "2.0.9",
44
"homepage": "https://github.com/mycolorway/simple-uploader",
55
"authors": [
66
"farthinker <[email protected]>"

lib/uploader.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Uploader = (function(superClass) {
3030

3131
Uploader.prototype.opts = {
3232
url: '',
33+
headers: null,
3334
params: null,
3435
fileKey: 'upload_file',
3536
connectionCount: 3
@@ -116,6 +117,7 @@ Uploader = (function(superClass) {
116117
return {
117118
id: this.generateId(),
118119
url: this.opts.url,
120+
headers: this.opts.headers,
119121
params: this.opts.params,
120122
fileKey: this.opts.fileKey,
121123
name: name,
@@ -126,7 +128,7 @@ Uploader = (function(superClass) {
126128
};
127129

128130
Uploader.prototype._xhrUpload = function(file) {
129-
var formData, k, ref, v;
131+
var formData, k, ref, v, headers;
130132
formData = new FormData();
131133
formData.append(file.fileKey, file.obj);
132134
formData.append("original_filename", file.name);
@@ -137,15 +139,19 @@ Uploader = (function(superClass) {
137139
formData.append(k, v);
138140
}
139141
}
142+
143+
headers = {
144+
'X-File-Name': encodeURIComponent(file.name)
145+
};
146+
$.extend(headers, file.headers);
147+
140148
return file.xhr = $.ajax({
141149
url: file.url,
142150
data: formData,
143151
processData: false,
144152
contentType: false,
145153
type: 'POST',
146-
headers: {
147-
'X-File-Name': encodeURIComponent(file.name)
148-
},
154+
headers: headers,
149155
xhr: function() {
150156
var req;
151157
req = $.ajaxSettings.xhr();

src/uploader.coffee

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class Uploader extends SimpleModule
55

66
opts:
77
url: ''
8+
headers: null
89
params: null
910
fileKey: 'upload_file'
1011
connectionCount: 3
@@ -72,6 +73,7 @@ class Uploader extends SimpleModule
7273

7374
id: @generateId()
7475
url: @opts.url
76+
headers: @opts.headers
7577
params: @opts.params
7678
fileKey: @opts.fileKey
7779
name: name
@@ -85,14 +87,16 @@ class Uploader extends SimpleModule
8587
formData.append("original_filename", file.name)
8688
formData.append(k, v) for k, v of file.params if file.params
8789

90+
headers = 'X-File-Name': encodeURIComponent(file.name)
91+
$.extend headers, file.headers
92+
8893
file.xhr = $.ajax
8994
url: file.url
9095
data: formData
9196
processData: false
9297
contentType: false
9398
type: 'POST'
94-
headers:
95-
'X-File-Name': encodeURIComponent(file.name)
99+
headers: headers
96100
xhr: ->
97101
req = $.ajaxSettings.xhr()
98102
if req
@@ -156,5 +160,3 @@ class Uploader extends SimpleModule
156160

157161
uploader = (opts) ->
158162
new Uploader(opts)
159-
160-

0 commit comments

Comments
 (0)