Skip to content

Commit 569d609

Browse files
committed
Merge pull request #160 from codedogfish/master
Fix IE 8 bugs
2 parents c71d0fb + 2aff3ed commit 569d609

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

dist/qiniu.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* qiniu-js-sdk v1.0.15-beta
2+
* qiniu-js-sdk v1.0.16-beta
33
*
44
* Copyright 2015 by Qiniu
55
* Released under GPL V2 License.
66
*
77
* GitHub: http://github.com/qiniu/js-sdk
88
*
9-
* Date: 2016-4-15
9+
* Date: 2016-5-31
1010
*/
1111

1212
/*global plupload ,mOxie*/
@@ -157,7 +157,7 @@ function QiniuJsSDK() {
157157
*/
158158
var qiniuUploadUrls = [
159159
"http://upload.qiniu.com",
160-
"http://up.qiniu.com",
160+
"http://up.qiniu.com"
161161
];
162162

163163
var changeUrlTimes = 0;
@@ -490,8 +490,8 @@ function QiniuJsSDK() {
490490
var isSpecialSafari = (mOxie.Env.browser === "Safari" && mOxie.Env.version <= 5 && mOxie.Env.os === "Windows" && mOxie.Env.osVersion === "7") || (mOxie.Env.browser === "Safari" && mOxie.Env.os === "iOS" && mOxie.Env.osVersion === "7");
491491
// case IE 9-,chunk_size is not empty and flash is included in runtimes
492492
// set op.chunk_size to zero
493-
//if (ie && ie <= 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
494-
if (ie && ie <= 9 && op.chunk_size && op.runtimes.indexOf('flash') < 0) {
493+
//if (ie && ie < 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
494+
if (ie && ie < 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
495495
// link: http://www.plupload.com/docs/Frequently-Asked-Questions#when-to-use-chunking-and-when-not
496496
// when plupload chunk_size setting is't null ,it cause bug in ie8/9 which runs flash runtimes (not support html5) .
497497
op.chunk_size = 0;

dist/qiniu.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)