Skip to content

Fix IE 8 bugs #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2016
Merged

Fix IE 8 bugs #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dist/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* qiniu-js-sdk v1.0.15-beta
* qiniu-js-sdk v1.0.16-beta
*
* Copyright 2015 by Qiniu
* Released under GPL V2 License.
*
* GitHub: http://github.com/qiniu/js-sdk
*
* Date: 2016-4-15
* Date: 2016-5-31
*/

/*global plupload ,mOxie*/
Expand Down Expand Up @@ -157,7 +157,7 @@ function QiniuJsSDK() {
*/
var qiniuUploadUrls = [
"http://upload.qiniu.com",
"http://up.qiniu.com",
"http://up.qiniu.com"
];

var changeUrlTimes = 0;
Expand Down Expand Up @@ -490,8 +490,8 @@ function QiniuJsSDK() {
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");
// case IE 9-，chunk_size is not empty and flash is included in runtimes
// set op.chunk_size to zero
//if (ie && ie <= 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
if (ie && ie <= 9 && op.chunk_size && op.runtimes.indexOf('flash') < 0) {
//if (ie && ie < 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
if (ie && ie < 9 && op.chunk_size && op.runtimes.indexOf('flash') >= 0) {
// link: http://www.plupload.com/docs/Frequently-Asked-Questions#when-to-use-chunking-and-when-not
// when plupload chunk_size setting is't null ,it cause bug in ie8/9 which runs flash runtimes (not support html5) .
op.chunk_size = 0;
Expand Down
4 changes: 2 additions & 2 deletions dist/qiniu.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading