Baby steps

cujojs · Jun 19, 2014 · a447346 · a447346
1 parent 2014d3e
commit a447346
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 134 deletions.
diff --git a/lib/decorators/flow.js b/lib/decorators/flow.js
@@ -20,7 +20,7 @@ define(function() {
 		 * @returns {undefined}
 		 */
 		Promise.prototype.done = function(onResult, onError) {
-			this._handler.visit(onResult, onError);
+			this._handler.visit(this._handler.receiver, onResult, onError);
 		};
 
 		/**

diff --git a/lib/decorators/fold.js b/lib/decorators/fold.js
@@ -10,7 +10,7 @@ define(function() {
 
 		Promise.prototype.fold = function(fn, arg) {
 			var promise = this._beget();
-			this._handler.fold(fn, arg, promise._handler);
+			this._handler.fold(fn, arg, void 0, promise._handler);
 			return promise;
 		};
 

diff --git a/lib/decorators/timed.js b/lib/decorators/timed.js
@@ -19,9 +19,10 @@ define(function(require) {
 			var p = this._beget();
 			var h = p._handler;
 
-			this._handler.map(function delay(x) {
+			this._handler.visit(h, function delay(x) {
+				var h = this;
 				timer.set(function() { h.resolve(x); }, ms);
-			}, h);
+			}, h.reject, h.notify);
 
 			return p;
 		};
@@ -42,10 +43,10 @@ define(function(require) {
 
 			var t = timer.set(onTimeout, ms);
 
-			this._handler.chain(h,
+			this._handler.visit(h,
 				function onFulfill(x) {
 					timer.clear(t);
-					h.resolve(x); // this = p._handler
+					this.resolve(x); // this = p._handler
 				},
 				function onReject(x) {
 					timer.clear(t);