Merge pull request #168 from canjs/cancel-af

Adds cancelAnimationFrame
canjs · Apr 14, 2018 · 3d75e2e · 3d75e2e
2 parents 20062f9 + bd61832
commit 3d75e2e
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6,950 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/lib/tasks.js b/lib/tasks.js
@@ -132,8 +132,24 @@ exports.clearImmediate = function(clearImmediate, Zone){
 
 exports.requestAnimationFrame = function(rAF, Zone){
 	return function(fn){
-		var callback = Zone.current.waitFor(fn);
-		return rAF.call(this, callback);
+		var zone = Zone.current;
+		var callback = zone.waitFor(fn);
+		var id = rAF.call(this, callback);
+		zone.rafs[id] = true;
+		return id;
+	};
+};
+
+exports.cancelAnimationFrame = function(cAF, Zone){
+	return function(id){
+		var zone = Zone.current;
+		var ids = zone.rafs;
+		var res = cAF.call(this, id);
+		if(!zone.isResolved && ids[id]) {
+			delete ids[id];
+			zone.removeWait();
+		}
+		return res;
 	};
 };
 

diff --git a/lib/zone.js b/lib/zone.js
@@ -129,7 +129,8 @@ function Zone(spec) {
 	spec = spec || {};
 	this.deferred = new Deferred();
 	this.waits = 0;
-	this.ids = {};
+	this.ids = Object.create(null);
+	this.rafs = Object.create(null);
 	this.errors = [];
 	this.data = {};
 	this.globals = {};