scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removing task queue constructor hacks.

Browse source
This commit is contained in:
Evelyn Eastmond 2019-02-19 19:15:09 -05:00 committed by unknown
parent 6688106852
commit dbb884ddef
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util/task-queue.js
View file

@ -21,15 +21,8 @@ class TaskQueue {
this._maxTokens = maxTokens;
this._refillRate = refillRate;
this._pendingTaskRecords = [];
<<<<<<< HEAD
this._tokenCount = options.hasOwnProperty('startingTokens') ? options.startingTokens : maxTokens;
this._maxTotalCost = options.hasOwnProperty('maxTotalCost') ? options.maxTotalCost : Infinity;
=======
// this._tokenCount = options.hasOwnProperty('startingTokens') ? options.startingTokens : maxTokens;
this._tokenCount = options ? maxTokens : maxTokens;
// this._maxTotalCost = options.hasOwnProperty('maxTotalCost') ? options.maxTotalCost : Infinity;
this._maxTotalCost = options ? options.maxTotalCost : Infinity;
>>>>>>> Continuing to test the newest TaskQueue with microbit.
this._timer = new Timer();
this._timer.start();
this._timeout = null;