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

Merge pull request #279 from nathan/rename-costume-update-refs

Browse source 
Fixed renaming costume breaking references to that costume
This commit is contained in:
Shane M. Clements 2014-06-18 12:57:29 +02:00
commit 111dbeac8e
2 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/scratch/ScratchRuntime.as
View file

@ -665,6 +665,19 @@ public class ScratchRuntime {
// Script utilities // Script utilities
//------------------------------ //------------------------------
public function renameCostume(newName:String):void {
var obj:ScratchObj = app.viewedObj();
var costume:ScratchCostume = obj.currentCostume();
var oldName:String = costume.costumeName;
if (obj.isCostumeNameUsed(newName)) return;
costume.costumeName = newName;
var uses:Array = obj.isStage ? allUsesOfBackdrop(oldName) : allUsesOfCostume(oldName);
for each (var a:BlockArg in uses) {
a.setArgValue(newName);
}
app.setSaveNeeded();
}
public function clearRunFeedback():void { public function clearRunFeedback():void {
if(app.editMode) { if(app.editMode) {
for each (var stack:Block in allStacks()) { for each (var stack:Block in allStacks()) {
@ -721,6 +734,30 @@ public class ScratchRuntime {
return false; return false;
} }
public function allUsesOfBackdrop(backdropName:String):Array {
var result:Array = [];
allStacksAndOwnersDo(function (stack:Block, target:ScratchObj):void {
stack.allBlocksDo(function (b:Block):void {
for each (var a:BlockArg in b.args) {
if (a.menuName == 'backdrop' && a.argValue == backdropName) result.push(a);
}
});
});
return result;
}
public function allUsesOfCostume(costumeName:String):Array {
var result:Array = [];
for each (var stack:Block in app.viewedObj().scripts) {
stack.allBlocksDo(function (b:Block):void {
for each (var a:BlockArg in b.args) {
if (a.menuName == 'costume' && a.argValue == costumeName) result.push(a);
}
});
}
return result;
}
public function allUsesOfVariable(varName:String, owner:ScratchObj):Array { public function allUsesOfVariable(varName:String, owner:ScratchObj):Array {
var variableBlocks:Array = [Specs.SET_VAR, Specs.CHANGE_VAR, "showVariable:", "hideVariable:"]; var variableBlocks:Array = [Specs.SET_VAR, Specs.CHANGE_VAR, "showVariable:", "hideVariable:"];
var result:Array = []; var result:Array = [];

10
src/ui/parts/ImagesPart.as
View file

@ -200,13 +200,9 @@ public class ImagesPart extends UIPart {
} }
private function nameChanged():void { private function nameChanged():void {
var obj:ScratchObj = app.viewedObj(); app.runtime.renameCostume(nameField.contents());
if(!obj.isCostumeNameUsed(nameField.contents())) { nameField.setContents(app.viewedObj().currentCostume().costumeName);
obj.currentCostume().costumeName = nameField.contents(); (listFrame.contents as MediaPane).refresh();
(listFrame.contents as MediaPane).refresh();
}
else
nameField.setContents(obj.currentCostume().costumeName);
} }
private function addNewCostumeButtons():void { private function addNewCostumeButtons():void {