Merge pull request #31 from brkyldz/master

kenwheeler · web-flow · commit a50338f6f2c8 · 2017-10-03T15:24:48.000-04:00
fixed GameLoop stop function
diff --git a/src/native/utils/game-loop.js b/src/native/utils/game-loop.js
@@ -16,12 +16,15 @@ export default class GameLoop {
     }
   }
   stop() {
-    window.cancelAnimationFrame(this.loop);
+    if (!this.loopID) {
+      window.cancelAnimationFrame(this.loopID);
+      this.loopID = null;
+    }
   }
   subscribe(callback) {
     return this.subscribers.push(callback);
   }
   unsubscribe(id) {
-    delete this.subscribers[id - 1];
+    this.subscribers.splice((id - 1), 1);
   }
 }
diff --git a/src/utils/game-loop.js b/src/utils/game-loop.js
@@ -16,12 +16,15 @@ export default class GameLoop {
     }
   }
   stop() {
-    window.cancelAnimationFrame(this.loopID);
+    if (!this.loopID) {
+      window.cancelAnimationFrame(this.loopID);
+      this.loopID = null;
+    }
   }
   subscribe(callback) {
     return this.subscribers.push(callback);
   }
   unsubscribe(id) {
-    delete this.subscribers[id - 1];
+    this.subscribers.splice((id - 1), 1);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,15 @@ export default class GameLoop {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`stop() {`
`19`		`- window.cancelAnimationFrame(this.loop);`
	`19`	`+ if (!this.loopID) {`
	`20`	`+ window.cancelAnimationFrame(this.loopID);`
	`21`	`+ this.loopID = null;`
	`22`	`+ }`
`20`	`23`	`}`
`21`	`24`	`subscribe(callback) {`
`22`	`25`	`return this.subscribers.push(callback);`
`23`	`26`	`}`
`24`	`27`	`unsubscribe(id) {`
`25`		`- delete this.subscribers[id - 1];`
	`28`	`+ this.subscribers.splice((id - 1), 1);`
`26`	`29`	`}`
`27`	`30`	`}`