Skip to content

Commit 452abf1

Browse files
committed
未指定accept的情况下使用allows参数
Signed-off-by: Devin <[email protected]>
1 parent 135ca00 commit 452abf1

7 files changed

+20
-13
lines changed

Q.Uploader.file.all.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
* Q.Uploader.js 文件上传管理器 1.0
384384
* https://github.com/devin87/web-uploader
385385
386-
* update:2018/04/12 10:05
386+
* update:2018/05/03 14:28
387387
*/
388388
(function (window, undefined) {
389389
"use strict";
@@ -637,7 +637,7 @@
637637

638638
//input元素的accept属性,用来指定浏览器接受的文件类型 eg:image/*,video/*
639639
//注意:IE9及以下不支持accept属性
640-
self.accept = ops.accept;
640+
self.accept = ops.accept || ops.allows;
641641

642642
//是否是文件夹上传,仅Webkit内核浏览器和新版火狐有效
643643
self.isDir = ops.isDir;

Q.Uploader.image.all.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
* Q.Uploader.js 文件上传管理器 1.0
384384
* https://github.com/devin87/web-uploader
385385
386-
* update:2018/04/12 10:05
386+
* update:2018/05/03 14:28
387387
*/
388388
(function (window, undefined) {
389389
"use strict";
@@ -637,7 +637,7 @@
637637

638638
//input元素的accept属性,用来指定浏览器接受的文件类型 eg:image/*,video/*
639639
//注意:IE9及以下不支持accept属性
640-
self.accept = ops.accept;
640+
self.accept = ops.accept || ops.allows;
641641

642642
//是否是文件夹上传,仅Webkit内核浏览器和新版火狐有效
643643
self.isDir = ops.isDir;

demo/image-single.html

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919
<a id="upload-target" class="x-button">添加图片并压缩</a>
2020
<a id="start-upload" class="x-button">开始上传</a>
2121
</div>
22-
<div id="upload-image-view" class="clearfix"></div>
22+
<div id="upload-image-view" class="clearfix">
23+
<div class="u-item">
24+
<div class="u-img">
25+
<!-- 此处可以显示从服务器获取的图片,选择图片后会自动覆盖此图片 -->
26+
<img src="bg-tab.png" />
27+
</div>
28+
</div>
29+
</div>
2330
<div id="log"></div>
2431
</div>
2532
</div>

dist/Q.Uploader.file.all.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/Q.Uploader.image.all.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/Q.Uploader.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/Q.Uploader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Q.Uploader.js 文件上传管理器 1.0
55
* https://github.com/devin87/web-uploader
66
7-
* update:2018/04/12 10:05
7+
* update:2018/05/03 14:28
88
*/
99
(function (window, undefined) {
1010
"use strict";
@@ -258,7 +258,7 @@
258258

259259
//input元素的accept属性,用来指定浏览器接受的文件类型 eg:image/*,video/*
260260
//注意:IE9及以下不支持accept属性
261-
self.accept = ops.accept;
261+
self.accept = ops.accept || ops.allows;
262262

263263
//是否是文件夹上传,仅Webkit内核浏览器和新版火狐有效
264264
self.isDir = ops.isDir;

0 commit comments

Comments
 (0)