From 6f949596d82a523d6b71118fa0c4c760e9c5396a Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <cwillisf@media.mit.edu>
Date: Tue, 3 May 2016 09:53:37 -0700
Subject: [PATCH] Use util.timeout instead of setTimeout
---
src/blocks/wedo2.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/blocks/wedo2.js b/src/blocks/wedo2.js
index 67ea1115d..c38b8f62d 100644
--- a/src/blocks/wedo2.js
+++ b/src/blocks/wedo2.js
@@ -1,4 +1,6 @@
+var YieldTimers = require('../util/yieldtimers.js');
+
function WeDo2Blocks(runtime) {
/**
* The runtime instantiating this block package.
@@ -107,7 +109,8 @@ WeDo2Blocks.prototype._HSVToRGB = function(hueDegrees, saturation, value) {
*/
WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
if (this._motorTimeout > 0) {
- clearTimeout(this._motorTimeout);
+ // @todo maybe this should go through util
+ YieldTimers.reject(this._motorTimeout);
this._motorTimeout = null;
}
if (window.native) {
@@ -115,7 +118,7 @@ WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
}
var instance = this;
- var myTimeout = this._motorTimeout = setTimeout(function() {
+ var myTimeout = this._motorTimeout = util.timeout(function() {
if (instance._motorTimeout == myTimeout) {
instance._motorTimeout = null;
}