scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 07:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix merge conflicts

Browse source
This commit is contained in:
DD Liu 2017-05-15 10:18:48 -04:00
parent 9060a35350
commit 4cfedc8d9d
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/engine/runtime.js
View file

@ -105,17 +105,10 @@ class Runtime extends EventEmitter {
this._cloneCounter = 0; this._cloneCounter = 0;
/** /**
<<<<<<< HEAD
* List of all monitors. * List of all monitors.
*/ */
this._monitorState = {}; this._monitorState = {};
=======
* Flag to emit a targets update at the end of a step. When target data
* changes, this flag is set to true.
* @type {boolean}
*/
this._refreshTargets = false;
>>>>>>> develop
/** /**
* Whether the project is in "turbo mode." * Whether the project is in "turbo mode."
@ -864,17 +857,6 @@ class Runtime extends EventEmitter {
this.emit(Runtime.VISUAL_REPORT, {id: blockId, value: String(value)}); this.emit(Runtime.VISUAL_REPORT, {id: blockId, value: String(value)});
} }
/**
<<<<<<< HEAD
* Emit a sprite info report if the provided target is the original sprite
* @param {!Target} target Target to report sprite info for.
*/
spriteInfoReport (target) {
if (!target.isOriginal) return;
this.emit(Runtime.SPRITE_INFO_REPORT, target.toJSON());
}
/** /**
* Add a monitor to the state. If the monitor already exists in the state, * Add a monitor to the state. If the monitor already exists in the state,
* overwrites it. * overwrites it.
@ -905,8 +887,6 @@ class Runtime extends EventEmitter {
} }
/** /**
=======
>>>>>>> develop
* Get a target by its id. * Get a target by its id.
* @param {string} targetId Id of target to find. * @param {string} targetId Id of target to find.
* @return {?Target} The target, if found. * @return {?Target} The target, if found.