scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-06-07 19:14:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Use util.timeout instead of setTimeout

Browse source
This commit is contained in:
Christopher Willis-Ford 2016-05-03 09:53:37 -07:00
parent e8089cd2a5
commit 6f949596d8
1 changed files with 5 additions and 2 deletions

7
src/blocks/wedo2.js
View file

@ -1,4 +1,6 @@
var YieldTimers = require('../util/yieldtimers.js');
function WeDo2Blocks(runtime) { function WeDo2Blocks(runtime) {
/** /**
* The runtime instantiating this block package. * The runtime instantiating this block package.
@ -107,7 +109,8 @@ WeDo2Blocks.prototype._HSVToRGB = function(hueDegrees, saturation, value) {
*/ */
WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) { WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
if (this._motorTimeout > 0) { if (this._motorTimeout > 0) {
clearTimeout(this._motorTimeout); // @todo maybe this should go through util
YieldTimers.reject(this._motorTimeout);
this._motorTimeout = null; this._motorTimeout = null;
} }
if (window.native) { if (window.native) {
@ -115,7 +118,7 @@ WeDo2Blocks.prototype._motorOnFor = function(direction, durationSeconds, util) {
} }
var instance = this; var instance = this;
var myTimeout = this._motorTimeout = setTimeout(function() { var myTimeout = this._motorTimeout = util.timeout(function() {
if (instance._motorTimeout == myTimeout) { if (instance._motorTimeout == myTimeout) {
instance._motorTimeout = null; instance._motorTimeout = null;
} }