github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-23 01:48:18 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

jq promise fixes

Browse Source 
return promise in always()
allow when() to accept a single array of arguments
This commit is contained in:
adelphes
2017-02-01 09:59:46 +00:00
parent a677d636f3
commit ab68b83900
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/jq-promise.js
View File

@@ -32,7 +32,7 @@ var Deferred = exports.Deferred = function(p, parent) {
var thendef = this.then(fn); var thendef = this.then(fn);
this.fail(function() { this.fail(function() {
// we cannot bind thendef to the function because we need the caller's this to resolve the thendef // we cannot bind thendef to the function because we need the caller's this to resolve the thendef
thendef.resolveWith(this, Array.prototype.map.call(arguments,x=>x)); return thendef.resolveWith(this, Array.prototype.map.call(arguments,x=>x))._promise;
}); });
return thendef; return thendef;
}, },
@@ -108,6 +108,9 @@ var Deferred = exports.Deferred = function(p, parent) {
// $.when() is jQuery's version of Promise.all() // $.when() is jQuery's version of Promise.all()
// - this version just scans the array of arguments waiting on any Deferreds in turn before finally resolving the return Deferred // - this version just scans the array of arguments waiting on any Deferreds in turn before finally resolving the return Deferred
var when = exports.when = function() { var when = exports.when = function() {
if (arguments.length === 1 && Array.isArray(arguments[0])) {
return when.apply(this,...arguments).then(() => [...arguments]);
}
var x = { var x = {
def: $.Deferred(), def: $.Deferred(),
args: Array.prototype.map.call(arguments,x=>x), args: Array.prototype.map.call(arguments,x=>x),