From 6df57e7aba7aa84fe4bdb8ec295724cb5864dde3 Mon Sep 17 00:00:00 2001 From: Mazhuga Vladimir Date: Thu, 21 Jul 2016 15:51:02 +0300 Subject: [PATCH] Fix error with timeout in ie11 --- facepp-sdk.coffee | 3 +- facepp-sdk.js | 87 +++++++++++++++++++++++++---------------------- facepp-sdk.min.js | 6 +--- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/facepp-sdk.coffee b/facepp-sdk.coffee index 91edfc4..6ad49a9 100644 --- a/facepp-sdk.coffee +++ b/facepp-sdk.coffee @@ -117,9 +117,10 @@ class @FacePP callback (response.error_code or -1), response return + xhr.open 'POST', url, true + if 'timeout' of xhr xhr.timeout = options.timeout - xhr.open 'POST', url, true if hasBlob form = new FormData diff --git a/facepp-sdk.js b/facepp-sdk.js index 4554c2f..8025f52 100644 --- a/facepp-sdk.js +++ b/facepp-sdk.js @@ -1,19 +1,18 @@ -// Generated by CoffeeScript 1.6.3 +// Generated by CoffeeScript 1.10.0 (function() { - var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; + var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; this.FacePP = (function() { FacePP.RE_TRIM = /^\/+|\/+$/g; function FacePP(apiKey, apiSecret, options) { - var defaults, k, queue, requestCapacity, scheduleRequest, - _this = this; + var defaults, k, queue, requestCapacity, scheduleRequest; this.apiKey = apiKey; this.apiSecret = apiSecret; if (options == null) { options = {}; } - this.sessionCheck = __bind(this.sessionCheck, this); + this.sessionCheck = bind(this.sessionCheck, this); defaults = { apiURL: 'https://apicn.faceplusplus.com/v2', sessionInterval: 500, @@ -31,18 +30,20 @@ this.requestAdapter = FacePP.adapter[options.ajaxAdapter]; if ((requestCapacity = options.concurrency) > 0) { queue = []; - scheduleRequest = function() { - var apiMethod, callback, data, _ref; - if (requestCapacity > 0 && queue.length > 0) { - --requestCapacity; - _ref = queue.shift(), apiMethod = _ref[0], data = _ref[1], callback = _ref[2]; - FacePP.prototype.request.call(_this, apiMethod, data, function(err, resp) { - ++requestCapacity; - setTimeout(scheduleRequest, 0); - callback(err, resp); - }); - } - }; + scheduleRequest = (function(_this) { + return function() { + var apiMethod, callback, data, ref; + if (requestCapacity > 0 && queue.length > 0) { + --requestCapacity; + ref = queue.shift(), apiMethod = ref[0], data = ref[1], callback = ref[2]; + FacePP.prototype.request.call(_this, apiMethod, data, function(err, resp) { + ++requestCapacity; + setTimeout(scheduleRequest, 0); + callback(err, resp); + }); + } + }; + })(this); this.request = function(apiMethod, data, callback) { queue.push([apiMethod, data, callback]); scheduleRequest(); @@ -61,32 +62,34 @@ }; FacePP.prototype.sessionCheck = function(session_id, callback) { - var _this = this; this.request('info/get_session', { session_id: session_id - }, function(err, result) { - if (err) { - callback(err, result); - } else if (result.status === 'FAILED') { - callback(result.result.error_code || -1, result.result); - } else if (result.status === 'INQUEUE') { - setTimeout(_this.sessionCheck, _this.sessionInterval, session_id, callback); - } else { - callback(null, result.result); - } - }); + }, (function(_this) { + return function(err, result) { + if (err) { + callback(err, result); + } else if (result.status === 'FAILED') { + callback(result.result.error_code || -1, result.result); + } else if (result.status === 'INQUEUE') { + setTimeout(_this.sessionCheck, _this.sessionInterval, session_id, callback); + } else { + callback(null, result.result); + } + }; + })(this)); }; FacePP.prototype.requestAsync = function(apiMethod, data, callback) { - var _this = this; data['async'] = 'true'; - this.request(apiMethod, data, function(err, result) { - if (err) { - callback(err, result); - } else { - setTimeout(_this.sessionCheck, _this.sessionInterval, result.session_id, callback); - } - }); + this.request(apiMethod, data, (function(_this) { + return function(err, result) { + if (err) { + callback(err, result); + } else { + setTimeout(_this.sessionCheck, _this.sessionInterval, result.session_id, callback); + } + }; + })(this)); }; FacePP.adapter = { @@ -108,7 +111,7 @@ if ((response = xhr.responseText)) { try { response = JSON.parse(response); - } catch (_error) {} + } catch (undefined) {} } callback((response != null ? response.error_code : void 0) || -1, response); }, @@ -134,7 +137,7 @@ if ((response = this.responseText)) { try { response = JSON.parse(response); - } catch (_error) {} + } catch (undefined) {} } if (this.status === 200) { callback(null, response); @@ -143,10 +146,10 @@ } } }; + xhr.open('POST', url, true); if ('timeout' in xhr) { xhr.timeout = options.timeout; } - xhr.open('POST', url, true); if (hasBlob) { form = new FormData; for (k in data) { @@ -158,7 +161,7 @@ encode = encodeURIComponent; tmp = []; for (k in data) { - tmp.push("" + (encode(k)) + "=" + (encode(data[k]))); + tmp.push((encode(k)) + "=" + (encode(data[k]))); } xhr.send(tmp.join('&')); } @@ -170,3 +173,5 @@ })(); }).call(this); + +//# sourceMappingURL=facepp-sdk.js.map diff --git a/facepp-sdk.min.js b/facepp-sdk.min.js index d288ee0..00884ab 100644 --- a/facepp-sdk.min.js +++ b/facepp-sdk.min.js @@ -1,5 +1 @@ -(function(){var k=function(d,a){return function(){return d.apply(a,arguments)}};this.FacePP=function(){function d(a,b,c){var e,f,g,h,l=this;this.apiKey=a;this.apiSecret=b;null==c&&(c={});this.sessionCheck=k(this.sessionCheck,this);a={apiURL:"https://apicn.faceplusplus.com/v2",sessionInterval:500,requestTimeout:1E4,ajaxAdapter:"FormData"in window?"XMLHttpRequest":"jQuery",concurrency:2};for(e in a)null==c[e]&&(c[e]=a[e]);this.apiURL=c.apiURL.replace(d.RE_TRIM,"");this.sessionInterval=c.sessionInterval; -this.requestTimeout=c.requestTimeout;this.requestAdapter=d.adapter[c.ajaxAdapter];0<(g=c.concurrency)&&(f=[],h=function(){var a,b,c,e;0g?"GET":"POST",timeout:c.timeout,error:function(a){if(a=a.responseText)try{a=JSON.parse(a)}catch(b){}e((null!=a?a.error_code:void 0)||-1,a)},success:function(a){e(null,a)}})},XMLHttpRequest:function(a,b,c,e){var f,g,d;f=!1;for(g in b)if(b[g]instanceof Blob){f=!0;break}d=new XMLHttpRequest;d.onreadystatechange=function(){var a;if(4===this.readyState){this.onreadystatechange=null;if(a=this.responseText)try{a=JSON.parse(a)}catch(b){}200=== -this.status?e(null,a):e(a.error_code||-1,a)}};"timeout"in d&&(d.timeout=c.timeout);d.open("POST",a,!0);if(f){a=new FormData;for(g in b)a.append(g,b[g]);d.send(a)}else{d.setRequestHeader("Content-type","application/x-www-form-urlencoded");a=encodeURIComponent;c=[];for(g in b)c.push(""+a(g)+"="+a(b[g]));d.send(c.join("&"))}}};return d}()}).call(this); +(function(){var bind=function(fn,me){return function(){return fn.apply(me,arguments)}};this.FacePP=function(){FacePP.RE_TRIM=/^\/+|\/+$/g;function FacePP(apiKey,apiSecret,options){var defaults,k,queue,requestCapacity,scheduleRequest;this.apiKey=apiKey;this.apiSecret=apiSecret;if(options==null){options={}}this.sessionCheck=bind(this.sessionCheck,this);defaults={apiURL:"https://apicn.faceplusplus.com/v2",sessionInterval:500,requestTimeout:10*1e3,ajaxAdapter:"FormData"in window?"XMLHttpRequest":"jQuery",concurrency:2};for(k in defaults){if(options[k]==null){options[k]=defaults[k]}}this.apiURL=options.apiURL.replace(FacePP.RE_TRIM,"");this.sessionInterval=options.sessionInterval,this.requestTimeout=options.requestTimeout;this.requestAdapter=FacePP.adapter[options.ajaxAdapter];if((requestCapacity=options.concurrency)>0){queue=[];scheduleRequest=function(_this){return function(){var apiMethod,callback,data,ref;if(requestCapacity>0&&queue.length>0){--requestCapacity;ref=queue.shift(),apiMethod=ref[0],data=ref[1],callback=ref[2];FacePP.prototype.request.call(_this,apiMethod,data,function(err,resp){++requestCapacity;setTimeout(scheduleRequest,0);callback(err,resp)})}}}(this);this.request=function(apiMethod,data,callback){queue.push([apiMethod,data,callback]);scheduleRequest()}}}FacePP.prototype.request=function(apiMethod,data,callback){var url;data["api_key"]=this.apiKey;data["api_secret"]=this.apiSecret;url=this.apiURL+"/"+apiMethod.replace(FacePP.RE_TRIM,"");this.requestAdapter(url,data,{timeout:this.requestTimeout},callback)};FacePP.prototype.sessionCheck=function(session_id,callback){this.request("info/get_session",{session_id:session_id},function(_this){return function(err,result){if(err){callback(err,result)}else if(result.status==="FAILED"){callback(result.result.error_code||-1,result.result)}else if(result.status==="INQUEUE"){setTimeout(_this.sessionCheck,_this.sessionInterval,session_id,callback)}else{callback(null,result.result)}}}(this))};FacePP.prototype.requestAsync=function(apiMethod,data,callback){data["async"]="true";this.request(apiMethod,data,function(_this){return function(err,result){if(err){callback(err,result)}else{setTimeout(_this.sessionCheck,_this.sessionInterval,result.session_id,callback)}}}(this))};FacePP.adapter={jQuery:function(url,data,options,callback){var k,valueLengthEst;valueLengthEst=0;for(k in data){valueLengthEst+=data[k].length||0}jQuery.ajax({url:url,dataType:"jsonp",crossDomain:true,data:data,method:valueLengthEst<1024?"GET":"POST",timeout:options.timeout,error:function(xhr){var response;if(response=xhr.responseText){try{response=JSON.parse(response)}catch(undefined){}}callback((response!=null?response.error_code:void 0)||-1,response)},success:function(data){callback(null,data)}})},XMLHttpRequest:function(url,data,options,callback){var encode,form,hasBlob,k,tmp,xhr;hasBlob=false;for(k in data){if(data[k]instanceof Blob){hasBlob=true;break}}xhr=new XMLHttpRequest;xhr.onreadystatechange=function(){var response;if(this.readyState===4){this.onreadystatechange=null;if(response=this.responseText){try{response=JSON.parse(response)}catch(undefined){}}if(this.status===200){callback(null,response)}else{callback(response.error_code||-1,response)}}};xhr.open("POST",url,true);if("timeout"in xhr){xhr.timeout=options.timeout}if(hasBlob){form=new FormData;for(k in data){form.append(k,data[k])}xhr.send(form)}else{xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");encode=encodeURIComponent;tmp=[];for(k in data){tmp.push(encode(k)+"="+encode(data[k]))}xhr.send(tmp.join("&"))}}};return FacePP}()}).call(this); \ No newline at end of file