Merge pull request scratchfoundation#618 from AndersBillLinden/only-one-filefilter

sclements · sclements · commit d364d76bda9d · 2015-04-05T17:05:57.000-06:00
Only have one FileFilter containing both suffixes (.sb and .sb2)
diff --git a/src/Scratch.as b/src/Scratch.as
@@ -24,6 +24,7 @@
 
 package {
 import blocks.*;
+import flash.net.FileFilter;
 
 import extensions.ExtensionManager;
 
@@ -144,9 +145,9 @@ public class Scratch extends Sprite {
 
 		playerBG = new Shape(); // create, but don't add
 		addParts();
-		
+
 		server.getSelectedLang(Translator.setLanguageValue);
-		
+
 
 		stage.addEventListener(MouseEvent.MOUSE_DOWN, gh.mouseDown);
 		stage.addEventListener(MouseEvent.MOUSE_MOVE, gh.mouseMove);
@@ -1166,7 +1167,7 @@ public class Scratch extends Sprite {
 		return new MediaInfo(obj, owningObj);
 	}
 
-	static public function loadSingleFile(fileLoaded:Function, filters:Array = null):void {
+	static public function loadSingleFile(fileLoaded:Function, filter:FileFilter = null):void {
 		function fileSelected(event:Event):void {
 			if (fileList.fileList.length > 0) {
 				var file:FileReference = FileReference(fileList.fileList[0]);
@@ -1179,7 +1180,7 @@ public class Scratch extends Sprite {
 		fileList.addEventListener(Event.SELECT, fileSelected);
 		try {
 			// Ignore the exception that happens when you call browse() with the file browser open
-			fileList.browse(filters);
+			fileList.browse(filter != null ? [filter] : null);
 		} catch(e:*) {}
 	}
 
diff --git a/src/scratch/ScratchRuntime.as b/src/scratch/ScratchRuntime.as
@@ -381,9 +381,8 @@ public class ScratchRuntime {
 			installProjectFromFile(fileName, data);
 		}
 		stopAll();
-		var filter1:FileFilter = new FileFilter('Scratch 1.4 Project', '*.sb');
-		var filter2:FileFilter = new FileFilter('Scratch 2 Project', '*.sb2');
-		Scratch.loadSingleFile(fileLoadHandler, [filter1, filter2])
+		var filter1:FileFilter = new FileFilter('Scratch Project', '*.sb;*.sb2');
+		Scratch.loadSingleFile(fileLoadHandler, filter1)
 	}
 
 	public function installProjectFromFile(fileName:String, data:ByteArray):void {

Original file line number	Diff line number	Diff line change
`@@ -381,9 +381,8 @@ public class ScratchRuntime {`
`381`	`381`	`installProjectFromFile(fileName, data);`
`382`	`382`	`}`
`383`	`383`	`stopAll();`
`384`		`- var filter1:FileFilter = new FileFilter('Scratch 1.4 Project', '*.sb');`
`385`		`- var filter2:FileFilter = new FileFilter('Scratch 2 Project', '*.sb2');`
`386`		`- Scratch.loadSingleFile(fileLoadHandler, [filter1, filter2])`
	`384`	`+ var filter1:FileFilter = new FileFilter('Scratch Project', '.sb;.sb2');`
	`385`	`+ Scratch.loadSingleFile(fileLoadHandler, filter1)`
`387`	`386`	`}`
`388`	`387`
`389`	`388`	`public function installProjectFromFile(fileName:String, data:ByteArray):void {`