scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Enhance sprite delete behavior

Browse source
This commit is contained in:
Paul Kaplan 2017-06-12 08:35:27 -04:00
parent 40345384aa
commit 9c5d43e9d3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/virtual-machine.js
View file

@ -364,6 +364,8 @@ class VirtualMachine extends EventEmitter {
*/ */
deleteSprite (targetId) { deleteSprite (targetId) {
const target = this.runtime.getTargetById(targetId); const target = this.runtime.getTargetById(targetId);
const targetIndexBeforeDelete = this.runtime.targets.map(t => t.id).indexOf(target.id);
if (target) { if (target) {
if (!target.isSprite()) { if (!target.isSprite()) {
throw new Error('Cannot delete non-sprite targets.'); throw new Error('Cannot delete non-sprite targets.');
@ -379,8 +381,8 @@ class VirtualMachine extends EventEmitter {
this.runtime.disposeTarget(sprite.clones[i]); this.runtime.disposeTarget(sprite.clones[i]);
// Ensure editing target is switched if we are deleting it. // Ensure editing target is switched if we are deleting it.
if (clone === currentEditingTarget) { if (clone === currentEditingTarget) {
const lastTargetIndex = this.runtime.targets.length - 1; const nextTargetIndex = Math.min(this.runtime.targets.length - 1, targetIndexBeforeDelete);
this.setEditingTarget(this.runtime.targets[lastTargetIndex].id); this.setEditingTarget(this.runtime.targets[nextTargetIndex].id);
} }
} }
// Sprite object should be deleted by GC. // Sprite object should be deleted by GC.