Skip to content
This repository was archived by the owner on Nov 27, 2018. It is now read-only.

API change #291

Merged
merged 1 commit into from
Apr 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = function (grunt) {
"src/cookie.js",
"src/data.js",
"src/datalist.js",
"src/deferred.js",
"src/element.js",
"src/filter.js",
"src/json.js",
Expand Down Expand Up @@ -74,7 +75,7 @@ module.exports = function (grunt) {
" * @version <%= pkg.version %>\n" +
" */\n",
mangle: {
except: ["abaaso", "DataList", "DataListFilter", "DataStore", "Promise"]
except: ["abaaso", "DataList", "DataListFilter", "DataStore", "Deferred", "Promise"]
}
},
dist: {
Expand Down
220 changes: 206 additions & 14 deletions lib/abaaso.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @license BSD-3 <https://raw.github.com/avoidwork/abaaso/master/LICENSE>
* @link http://abaaso.com
* @module abaaso
* @version 3.6.25
* @version 3.7.0
*/
( function ( global ) {

Expand Down Expand Up @@ -4362,6 +4362,175 @@ function DataList ( element, store, template ) {
DataList.prototype = datalist.methods;
DataList.prototype.constructor = DataList;

/**
* Deferreds
*
* @type {Object}
*/
var deferred = {
/**
* Deferred factory
*
* @method factory
* @return {Object} Deferred
*/
factory : function () {
return new Deferred();
},

// Inherited by deferreds
methods : {
/**
* Registers a function to execute after Promise is reconciled
*
* @param {Function} arg Function to execute
* @return {Object} Deferred
*/
always : function ( arg ) {
if ( typeof arg !== "function" ) {
throw Error( label.error.invalidArguments );
}

if ( this.promise.resolved() ) {
throw Error( label.error.promiseResolved.replace( "{{outcome}}", this.promise.outcome ) );
}

this.onAlways.push( arg );

return this;
},

/**
* Registers a function to execute after Promise is resolved
*
* @param {Function} arg Function to execute
* @return {Object} Deferred
*/
done : function ( arg ) {
if ( typeof arg !== "function" ) {
throw Error( label.error.invalidArguments );
}

if ( this.promise.resolved() ) {
throw Error( label.error.promiseResolved.replace( "{{outcome}}", this.promise.outcome ) );
}

this.onDone.push( arg );

return this;
},

/**
* Registers a function to execute after Promise is rejected
*
* @param {Function} arg Function to execute
* @return {Object} Deferred
*/
fail : function ( arg ) {
if ( typeof arg !== "function" ) {
throw Error( label.error.invalidArguments );
}

if ( this.promise.resolved() ) {
throw Error( label.error.promiseResolved.replace( "{{outcome}}", this.promise.outcome ) );
}

this.onFail.push( arg );

return this;
},

/**
* Determines if Deferred is rejected
*
* @return {Boolean} `true` if rejected
*/
isRejected : function () {
return ( this.promise.state === promise.state.broken );
},

/**
* Determines if Deferred is resolved
*
* @return {Boolean} `true` if rejected
*/
isResolved : function () {
return ( this.promise.state === promise.state.resolved );
},

/**
* Rejects the Promise
*
* @param {Mixed} arg Rejection outcome
* @return {Object} Deferred
*/
reject : function ( arg ) {
this.promise.reject.call( this.promise, arg );

return this;
},

/**
* Resolves the Promise
*
* @param {Mixed} arg Resolution outcome
* @return {Object} Deferred
*/
resolve : function ( arg ) {
this.promise.resolve.call( this.promise, arg );

return this;
}
}
};


/**
* Deferred factory
*
* @class Deferred
* @namespace abaaso
* @return {Object} Instance of Deferred
*/
function Deferred () {
var self = this;

this.promise = promise.factory();
this.onDone = [];
this.onAlways = [];
this.onFail = [];

utility.when( this.promise ).then( function ( arg ) {
array.each( self.onDone, function ( i ) {
i( arg );
});

array.each( self.onAlways, function ( i ) {
i( arg );
});

self.onAlways = [];
self.onDone = [];
self.onFail = [];
}, function ( arg ) {
array.each( self.onFail, function ( i ) {
i( arg );
});

array.each( self.onAlways, function ( i ) {
i( arg );
});

self.onAlways = [];
self.onDone = [];
self.onFail = [];
});
};

// Setting prototype & constructor loop
Deferred.prototype = deferred.methods;
Deferred.prototype.constructor = Deferred;

/**
* Element methods
*
Expand Down Expand Up @@ -6463,9 +6632,13 @@ var promise = {
self.outcome = null;
result.parentNode = self;
result.then( function ( arg ) {
self.resolve( arg );
array.each( self.children, function ( i ) {
i.resolve( arg );
});
}, function ( arg ) {
self.reject( arg );
array.each( self.children, function ( i ) {
i.reject( arg );
});
});
}

Expand All @@ -6483,8 +6656,9 @@ var promise = {
return fn(false);
});

// Setting reference to `self`
// Setting references
deferred.parentNode = self;
self.children.push( deferred );

return deferred;
}
Expand All @@ -6507,7 +6681,13 @@ var promise = {
i, reason, result;

if ( this.state !== promise.state.pending ) {
throw Error( label.error.promiseResolved.replace( "{{outcome}}", this.outcome ) );
// Walking "forward" from a reverse chain or a fork, we've already been here...
if ( ( this.parentNode !== null && this.parentNode.state === promise.state.resolved ) || this.children.length > 0 ) {
return;
}
else {
throw Error( label.error.promiseResolved.replace( "{{outcome}}", this.outcome ) );
}
}

this.state = state;
Expand Down Expand Up @@ -6604,6 +6784,7 @@ var promise = {
* @return {Object} Instance of Promise
*/
function Promise () {
this.children = [];
this.error = [];
this.fulfill = [];
this.parentNode = null;
Expand Down Expand Up @@ -9451,15 +9632,25 @@ var utility = {
array.each( promises, function ( p ) {
p.then( function ( arg) {
if ( ++i === nth && !deferred.resolved()) {
deferred.resolve( promises.map( function ( obj ) {
return obj.outcome;
}));
if ( promises.length > 1 ) {
deferred.resolve( promises.map( function ( obj ) {
return obj.outcome;
}));
}
else {
deferred.resolve( promises[0].outcome );
}
}
}, function ( e ) {
if ( !deferred.resolved() ) {
deferred.reject( promises.map( function ( obj ) {
return obj.outcome;
}));
if ( promises.length > 1 ) {
deferred.reject( promises.map( function ( obj ) {
return obj.outcome;
}));
}
else {
deferred.reject( promises[0].outcome );
}
}
});
});
Expand Down Expand Up @@ -9581,7 +9772,7 @@ var xhr = function () {
XMLHttpRequest, headers, handler, handlerError, state;

headers = {
"User-Agent" : "abaaso/3.6.25 node.js/" + process.versions.node.replace( /^v/, "" ) + " (" + string.capitalize( process.platform ) + " V8/" + process.versions.v8 + " )",
"User-Agent" : "abaaso/3.7.0 node.js/" + process.versions.node.replace( /^v/, "" ) + " (" + string.capitalize( process.platform ) + " V8/" + process.versions.v8 + " )",
"Content-Type" : "text/plain",
"Accept" : "*/*"
};
Expand Down Expand Up @@ -10539,11 +10730,12 @@ return {
},
debounce : utility.debounce,
decode : json.decode,
defer : utility.defer,
defer : deferred.factory,
define : utility.define,
del : function ( uri, success, failure, headers, timeout ) {
return client.request( uri, "DELETE", success, failure, null, headers, timeout );
},
delay : utility.defer,
destroy : element.destroy,
encode : json.encode,
error : utility.error,
Expand Down Expand Up @@ -10704,7 +10896,7 @@ return {
update : element.update,
uuid : utility.uuid,
validate : validate.test,
version : "3.6.25",
version : "3.7.0",
walk : utility.walk,
when : utility.when
};
Expand Down
10 changes: 5 additions & 5 deletions lib/abaaso.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/abaaso.source-map.js

Large diffs are not rendered by default.

Binary file modified lib/compressed/abaaso.js.gz
Binary file not shown.
Binary file modified lib/compressed/abaaso.min.js.gz
Binary file not shown.
Binary file modified lib/compressed/abaaso.source-map.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "abaaso",
"description": "abaaso is a modern, lightweight Enterprise class RESTful JavaScript application framework.",
"version": "3.6.25",
"version": "3.7.0",
"homepage": "http://abaaso.com",
"author": {
"name": "Jason Mulligan",
Expand Down
Loading