Modify requestqueue to use es6-promise

Shuwen Qian · Dan Lasky · commit c88e754c7f6c · 2016-03-01T16:23:49.000-06:00
diff --git a/src/shared/js/requestqueue.html b/src/shared/js/requestqueue.html
@@ -1,4 +1,5 @@
-<link rel="import" href="zousan.html"/>
+<link rel="import" href="es6-promise.html"/>
+<!-- <link rel="import" href="zousan.html"/> -->
 <script>
 /**
  * @license
@@ -17,7 +18,11 @@
 		this.flight = [];
 		this.concurrency = concurrency;
 		this.processHook = hook;
-		this.promise = new Zousan();
+		this.defer = {};
+		this.promise = new Promise(function(resolve, reject) {
+			this.defer.resolve = resolve;
+			this.defer.reject = reject;
+		}.bind(this));
 
 	}
 
@@ -34,14 +39,14 @@
 			},this);
 
 			if (chunk && chunk.length > 0) {
-				var all = Zousan.all(chunk);
+				var all = Promise.all(chunk);
 				all.then(this.next.bind(this), this.fail.bind(this));
 			} else {
-				this.promise.resolve(this.results);
+				this.defer.resolve(this.results);
 			}
 		},
 		fail: function(val) {
-			this.promise.reject(val);
+			this.defer.reject(val);
 			this.failures.push(val);
 		},
 		exec: function() {
@@ -52,11 +57,11 @@
 			this.flight.forEach(function(r) {
 				r.abort();
 			});
-			this.promise.reject(new Error("Aborted"));
+			this.defer.reject(new Error("Aborted"));
 		}
 	};
 
 	scope.RequestQueue = RequestQueue;
 
-})(window.StrandLib = window.StrandLib || {}); 
-</script>
+})(window.StrandLib = window.StrandLib || {});
+</script>
diff --git a/test/lib_requestqueue.html b/test/lib_requestqueue.html
@@ -12,38 +12,41 @@
 <body>
 	<script>
 	function Req() {
-		this.promise = new Zousan();
+		this.promise = new Promise(function(resolve) {
+			resolve({response:"yes"});
+		});
 	}
 	Req.prototype = {
 		exec: function() {
-			this.promise.resolve({response:"yes"});
 			return this.promise;
 		}
 	};
 
 	function FReq() {
-		this.promise = new Zousan();
+		this.promise = new Promise(function(resolve, reject) {
+			reject({response:"no"});
+		});
 	}
 	FReq.prototype = {
 		exec: function() {
 			this.promise.then(function(){},function(){});
-			this.promise.reject({response:"no"});
 			return this.promise;
 		}
 	};
 	function AReq() {
-		this.promise = new Zousan();
+		this.promise = new Promise(function(resolve) {
+			resolve({response:"yes"});
+		});
 	}
 	AReq.prototype = {
 		exec: function() {
-			this.promise.resolve({response:"yes"});
 			return this.promise;
 		},
 		abort: sinon.spy()
 	};
 
 	describe("RequestQueue", function() {
-		
+
 		it("should exist", function() {
 			StrandLib.RequestQueue.should.be.a.function;
 		});
@@ -137,4 +140,4 @@
 	});
 	</script>
 </body>
-</html>
+</html>
