Merge pull request canjs#2144 from canjs/2136-list-replace

Fixes problem with an earlier promise passed to replace overwriting a later promise.
cherifGsoul · Dec 16, 2015 · fe21baf · fe21baf
2 parents 4bf7e49 + 87ec424
commit fe21baf
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 9 deletions.
diff --git a/list/list.js b/list/list.js
@@ -833,7 +833,17 @@ steal("can/util", "can/map", "can/map/bubble.js","can/map/map_helpers.js",functi
 		 */
 		replace: function (newList) {
 			if (can.isDeferred(newList)) {
-				newList.then(can.proxy(this.replace, this));
+				if(this._promise) {
+					this._promise.__isCurrentPromise = false;
+				}
+				var promise = this._promise = newList;
+				promise.__isCurrentPromise = true;
+				var self = this;
+				newList.then(function(newList){
+					if(promise.__isCurrentPromise) {
+						self.replace(newList);
+					}
+				});
 			} else {
 				this.splice.apply(this, [0, this.length].concat(can.makeArray(newList || [])));
 			}

diff --git a/list/list_test.js b/list/list_test.js
@@ -341,4 +341,32 @@ steal("can/util", "can/list", "can/test", "can/compute", "steal-qunit", function
 
 	});
 
+
+	test("list is always updated with the last promise passed to replace (#2136)", function(){
+
+		var list = new can.List();
+
+		stop();
+
+		list.replace( new can.Deferred( function( def ) {
+			setTimeout( function(){
+				def.resolve([ "A" ]);
+
+				setTimeout(function(){
+					equal(list.attr(0), "B", "list set to last promise's value");
+					start();
+				},10);
+
+			}, 20 );
+		}));
+
+		list.replace( new can.Deferred( function( def ) {
+			setTimeout( function(){
+				def.resolve([ "B" ]);
+			}, 10 );
+		}));
+	});
+
+
+
 });
diff --git a/list/promise/promise.js b/list/promise/promise.js
@@ -9,6 +9,10 @@ steal("can/util/can.js", "can/list", function (can) {
 
 		// If there is a deferred:
 		if (can.isDeferred(data)) {
+			if(this._deferred) {
+				this._deferred.__cancelState = true;
+			}
+
 			// Set up its state.  Must call this way
 			// because we are working on an array.
 			can.batch.start();
@@ -19,17 +23,22 @@ steal("can/util/can.js", "can/list", function (can) {
 			var self = this;
 			// update its state when it changes
 			var deferred = this._deferred = new can.Deferred();
+			deferred.__cancelState = false;
 
 			data.then(function(){
-				self.attr("state", data.state());
-				// The deferred methods will always return this object
-				deferred.resolve(self);
+				if(!deferred.__cancelState) {
+					self.attr("state", data.state());
+					// The deferred methods will always return this object
+					deferred.resolve(self);
+				}
 			},function(reason){
-				can.batch.start();
-				self.attr("state", data.state());
-				self.attr("reason", reason);
-				can.batch.stop();
-				deferred.reject(reason);
+				if(!deferred.__cancelState) {
+					can.batch.start();
+					self.attr("state", data.state());
+					self.attr("reason", reason);
+					can.batch.stop();
+					deferred.reject(reason);
+				}
 			});
 		}
 		return result;

diff --git a/list/promise/promise_test.js b/list/promise/promise_test.js
@@ -154,6 +154,30 @@ steal("can/list/promise", "can/compute", "can/test", "steal-qunit", function ()
 
 	});
 
+	test("list is always updated with the last promise passed to replace (#2136)", function(){
+
+		var list = new can.List();
+
+		stop();
+
+		list.replace( new can.Deferred( function( def ) {
+			setTimeout( function(){
+				def.resolve([ "A" ]);
+
+				setTimeout(function(){
+					equal(list.attr(0), "B", "list set to last promise's value");
+					start();
+				},10);
+
+			}, 20 );
+		}));
+
+		list.replace( new can.Deferred( function( def ) {
+			setTimeout( function(){
+				def.resolve([ "B" ]);
+			}, 10 );
+		}));
+	});