Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit fa562fd

Browse files
carsonxucarsonxu
committed
升级webuploader
1 parent 47a2a55 commit fa562fd

10 files changed

+80
-37
lines changed

‎third-party/webuploader/webuploader.custom.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,12 @@
12741274
case 'change':
12751275
files = me.exec('getFiles');
12761276
me.trigger( 'select', $.map( files, function( file ) {
1277-
return new File( me.getRuid(), file );
1278-
}) );
1277+
file = new File( me.getRuid(), file );
1278+
1279+
// 记录来源。
1280+
file._refer = opts.container;
1281+
return file;
1282+
}), opts.container );
12791283
break;
12801284
}
12811285
});
@@ -1808,6 +1812,8 @@
18081812

18091813
// 为空的话则保留原有图片格式。
18101814
// 否则强制转换成指定的类型。
1815+
// IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可
1816+
// 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg
18111817
type: 'image/jpeg'
18121818
},
18131819

@@ -2524,16 +2530,19 @@
25242530
_addFile: function( file ) {
25252531
var me = this;
25262532

2527-
if ( !me.acceptFile( file ) ) {
2528-
return;
2529-
}
2530-
25312533
file = me._wrapFile( file );
25322534

2535+
// 不过类型判断允许不允许，先派送 `beforeFileQueued`
25332536
if ( !me.owner.trigger( 'beforeFileQueued', file ) ) {
25342537
return;
25352538
}
25362539

2540+
// 类型不匹配，则派送错误事件，并返回。
2541+
if ( !me.acceptFile( file ) ) {
2542+
me.owner.trigger( 'error', 'Q_TYPE_DENIED', file );
2543+
return;
2544+
}
2545+
25372546
me.queue.append( file );
25382547
me.owner.trigger( 'fileQueued', file );
25392548
return file;

‎third-party/webuploader/webuploader.custom.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎third-party/webuploader/webuploader.flashonly.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,12 @@
12741274
case 'change':
12751275
files = me.exec('getFiles');
12761276
me.trigger( 'select', $.map( files, function( file ) {
1277-
return new File( me.getRuid(), file );
1278-
}) );
1277+
file = new File( me.getRuid(), file );
1278+
1279+
// 记录来源。
1280+
file._refer = opts.container;
1281+
return file;
1282+
}), opts.container );
12791283
break;
12801284
}
12811285
});
@@ -1808,6 +1812,8 @@
18081812

18091813
// 为空的话则保留原有图片格式。
18101814
// 否则强制转换成指定的类型。
1815+
// IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可
1816+
// 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg
18111817
type: 'image/jpeg'
18121818
},
18131819

@@ -2524,16 +2530,19 @@
25242530
_addFile: function( file ) {
25252531
var me = this;
25262532

2527-
if ( !me.acceptFile( file ) ) {
2528-
return;
2529-
}
2530-
25312533
file = me._wrapFile( file );
25322534

2535+
// 不过类型判断允许不允许，先派送 `beforeFileQueued`
25332536
if ( !me.owner.trigger( 'beforeFileQueued', file ) ) {
25342537
return;
25352538
}
25362539

2540+
// 类型不匹配，则派送错误事件，并返回。
2541+
if ( !me.acceptFile( file ) ) {
2542+
me.owner.trigger( 'error', 'Q_TYPE_DENIED', file );
2543+
return;
2544+
}
2545+
25372546
me.queue.append( file );
25382547
me.owner.trigger( 'fileQueued', file );
25392548
return file;

‎third-party/webuploader/webuploader.flashonly.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎third-party/webuploader/webuploader.html5only.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,8 +1635,12 @@
16351635
case 'change':
16361636
files = me.exec('getFiles');
16371637
me.trigger( 'select', $.map( files, function( file ) {
1638-
return new File( me.getRuid(), file );
1639-
}) );
1638+
file = new File( me.getRuid(), file );
1639+
1640+
// 记录来源。
1641+
file._refer = opts.container;
1642+
return file;
1643+
}), opts.container );
16401644
break;
16411645
}
16421646
});
@@ -2002,6 +2006,8 @@
20022006

20032007
// 为空的话则保留原有图片格式。
20042008
// 否则强制转换成指定的类型。
2009+
// IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可
2010+
// 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg
20052011
type: 'image/jpeg'
20062012
},
20072013

@@ -2718,16 +2724,19 @@
27182724
_addFile: function( file ) {
27192725
var me = this;
27202726

2721-
if ( !me.acceptFile( file ) ) {
2722-
return;
2723-
}
2724-
27252727
file = me._wrapFile( file );
27262728

2729+
// 不过类型判断允许不允许，先派送 `beforeFileQueued`
27272730
if ( !me.owner.trigger( 'beforeFileQueued', file ) ) {
27282731
return;
27292732
}
27302733

2734+
// 类型不匹配，则派送错误事件，并返回。
2735+
if ( !me.acceptFile( file ) ) {
2736+
me.owner.trigger( 'error', 'Q_TYPE_DENIED', file );
2737+
return;
2738+
}
2739+
27312740
me.queue.append( file );
27322741
me.owner.trigger( 'fileQueued', file );
27332742
return file;

‎third-party/webuploader/webuploader.html5only.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎third-party/webuploader/webuploader.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,8 +1635,12 @@
16351635
case 'change':
16361636
files = me.exec('getFiles');
16371637
me.trigger( 'select', $.map( files, function( file ) {
1638-
return new File( me.getRuid(), file );
1639-
}) );
1638+
file = new File( me.getRuid(), file );
1639+
1640+
// 记录来源。
1641+
file._refer = opts.container;
1642+
return file;
1643+
}), opts.container );
16401644
break;
16411645
}
16421646
});
@@ -2002,6 +2006,8 @@
20022006

20032007
// 为空的话则保留原有图片格式。
20042008
// 否则强制转换成指定的类型。
2009+
// IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可
2010+
// 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg
20052011
type: 'image/jpeg'
20062012
},
20072013

@@ -2718,16 +2724,19 @@
27182724
_addFile: function( file ) {
27192725
var me = this;
27202726

2721-
if ( !me.acceptFile( file ) ) {
2722-
return;
2723-
}
2724-
27252727
file = me._wrapFile( file );
27262728

2729+
// 不过类型判断允许不允许，先派送 `beforeFileQueued`
27272730
if ( !me.owner.trigger( 'beforeFileQueued', file ) ) {
27282731
return;
27292732
}
27302733

2734+
// 类型不匹配，则派送错误事件，并返回。
2735+
if ( !me.acceptFile( file ) ) {
2736+
me.owner.trigger( 'error', 'Q_TYPE_DENIED', file );
2737+
return;
2738+
}
2739+
27312740
me.queue.append( file );
27322741
me.owner.trigger( 'fileQueued', file );
27332742
return file;

‎third-party/webuploader/webuploader.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎third-party/webuploader/webuploader.withoutimage.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,8 +1635,12 @@
16351635
case 'change':
16361636
files = me.exec('getFiles');
16371637
me.trigger( 'select', $.map( files, function( file ) {
1638-
return new File( me.getRuid(), file );
1639-
}) );
1638+
file = new File( me.getRuid(), file );
1639+
1640+
// 记录来源。
1641+
file._refer = opts.container;
1642+
return file;
1643+
}), opts.container );
16401644
break;
16411645
}
16421646
});
@@ -2354,16 +2358,19 @@
23542358
_addFile: function( file ) {
23552359
var me = this;
23562360

2357-
if ( !me.acceptFile( file ) ) {
2358-
return;
2359-
}
2360-
23612361
file = me._wrapFile( file );
23622362

2363+
// 不过类型判断允许不允许，先派送 `beforeFileQueued`
23632364
if ( !me.owner.trigger( 'beforeFileQueued', file ) ) {
23642365
return;
23652366
}
23662367

2368+
// 类型不匹配，则派送错误事件，并返回。
2369+
if ( !me.acceptFile( file ) ) {
2370+
me.owner.trigger( 'error', 'Q_TYPE_DENIED', file );
2371+
return;
2372+
}
2373+
23672374
me.queue.append( file );
23682375
me.owner.trigger( 'fileQueued', file );
23692376
return file;

‎third-party/webuploader/webuploader.withoutimage.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)