From 99fb19c76c4d5dff5e123450c87bd708d3ff2a15 Mon Sep 17 00:00:00 2001 From: Aleksey Sudilovskiy Date: Tue, 13 Jun 2017 11:08:04 +0300 Subject: [PATCH 1/2] Allow all 2xx codes as success one --- lib/FileAPI.XHR.js | 2 +- lib/FileAPI.core.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/FileAPI.XHR.js b/lib/FileAPI.XHR.js index ba4a158d..b4e109fc 100644 --- a/lib/FileAPI.XHR.js +++ b/lib/FileAPI.XHR.js @@ -46,7 +46,7 @@ } api.log('xhr.end:', status, statusText); - options.complete(status == 200 || status == 201 ? false : _this.statusText || 'unknown', _this); + options.complete(status < 300 && status >= 200 ? false : _this.statusText || 'unknown', _this); if( _this.xhr && _this.xhr.node ){ setTimeout(function (){ diff --git a/lib/FileAPI.core.js b/lib/FileAPI.core.js index ba825b70..afeae72a 100644 --- a/lib/FileAPI.core.js +++ b/lib/FileAPI.core.js @@ -1154,7 +1154,7 @@ }); } else { - var successful = proxyXHR.status == 200 || proxyXHR.status == 201 || proxyXHR.status == 204; + var successful = proxyXHR.status < 300 && proxyXHR.status >= 200; options.complete(successful ? false : (proxyXHR.statusText || 'error'), proxyXHR, options); // Mark done state _complete = true; @@ -1396,7 +1396,7 @@ xhr.onreadystatechange = function(){ if( xhr.readyState == 4 ){ xhr.onreadystatechange = null; - if( xhr.status == 200 ){ + if( xhr.status < 300 && xhr.status >= 200 ){ url = url.split('/'); /** @namespace xhr.responseBody */ var file = { @@ -1472,6 +1472,11 @@ } + function _responseIsSuccessful(status) { + return status < 300; + } + + function _readAs(file, fn, method, encoding){ if( api.isBlob(file) && _hasSupportReadAs(method) ){ var Reader = new FileReader; From 760c2025a526c075fc523226cf3ec707004b8ebf Mon Sep 17 00:00:00 2001 From: Aleksey Sudilovskiy Date: Tue, 13 Jun 2017 11:11:58 +0300 Subject: [PATCH 2/2] Cleanup --- lib/FileAPI.core.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/FileAPI.core.js b/lib/FileAPI.core.js index afeae72a..71fe01f7 100644 --- a/lib/FileAPI.core.js +++ b/lib/FileAPI.core.js @@ -1472,11 +1472,6 @@ } - function _responseIsSuccessful(status) { - return status < 300; - } - - function _readAs(file, fn, method, encoding){ if( api.isBlob(file) && _hasSupportReadAs(method) ){ var Reader = new FileReader;