|
1 | 1 | package haxe.ui.backend; |
2 | 2 |
|
3 | | -import haxe.ui.containers.dialogs.Dialogs.SelectedFileInfo; |
| 3 | + |
4 | 4 | #if !js |
5 | 5 | import haxe.io.Bytes; |
6 | 6 | import haxe.ui.containers.dialogs.Dialog.DialogButton; |
| 7 | +import haxe.ui.containers.dialogs.Dialogs.FileDialogExtensionInfo; |
| 8 | +import haxe.ui.containers.dialogs.Dialogs.SelectedFileInfo; |
7 | 9 | import openfl.events.Event; |
8 | 10 | import openfl.net.FileFilter; |
9 | 11 | import openfl.net.FileReference; |
10 | 12 | import openfl.net.FileReferenceList; |
11 | | -#end |
12 | 13 |
|
13 | 14 | using StringTools; |
| 15 | +#end |
| 16 | + |
14 | 17 |
|
15 | 18 |
|
16 | 19 | @:access(openfl.net.FileReference) |
@@ -46,42 +49,42 @@ class OpenFileDialogImpl extends OpenFileDialogBase { |
46 | 49 | private var _infos:Array<SelectedFileInfo>; |
47 | 50 |
|
48 | 51 | public override function show() { |
| 52 | + var extensions = null; |
| 53 | + if (options != null) { |
| 54 | + extensions = options.extensions; |
| 55 | + } |
| 56 | + |
49 | 57 | _refToInfo = new Map<FileReference, SelectedFileInfo>(); |
50 | 58 | _infos = []; |
51 | 59 | _fr = new FileReferenceList(); |
52 | 60 | _fr.addEventListener(Event.SELECT, onSelect, false, 0, true); |
53 | 61 | _fr.addEventListener(Event.CANCEL, onCancel, false, 0, true); |
54 | | - _fr.browse(buildFileFilters()); |
| 62 | + _fr.browse(buildFileFilters(extensions)); |
55 | 63 | } |
56 | 64 |
|
57 | | - private function buildFileFilters():Array<FileFilter> { |
58 | | - var f = null; |
59 | | - |
60 | | - /* DOESNT WORK AS OPENFL DOCS STATE |
61 | | - if (options.extensions != null && options.extensions.length > 0) { |
62 | | - f = []; |
63 | | - for (e in options.extensions) { |
64 | | - var ext = e.extension; |
65 | | - ext = ext.trim(); |
66 | | - if (ext.length == 0) { |
| 65 | + private function buildFileFilters(extensions:Array<FileDialogExtensionInfo>):Array<FileFilter> { |
| 66 | + if (extensions == null) { |
| 67 | + return null; |
| 68 | + } |
| 69 | + |
| 70 | + var fileFilters:Array<FileFilter> = []; |
| 71 | + for (extension in extensions) { |
| 72 | + var extensionList = extension.extension.split(","); |
| 73 | + var fileFilterExtensions = ""; |
| 74 | + for (extensionItem in extensionList) { |
| 75 | + extensionItem = extensionItem.trim(); |
| 76 | + if (extensionItem.length == 0) { |
67 | 77 | continue; |
68 | 78 | } |
69 | | - var parts = ext.split(","); |
70 | | - var finalParts = []; |
71 | | - for (p in parts) { |
72 | | - p = p.trim(); |
73 | | - if (p.length == 0) { |
74 | | - continue; |
75 | | - } |
76 | | - finalParts.push("*." + p); |
77 | | - } |
78 | | - |
79 | | - f.push(new FileFilter(e.label, finalParts.join(";"))); |
| 79 | + |
| 80 | + fileFilterExtensions += "*." + extensionItem + ";"; |
| 81 | + } |
| 82 | + if (fileFilterExtensions.length != 0) { |
| 83 | + fileFilters.push(new FileFilter(extension.label, fileFilterExtensions)); |
80 | 84 | } |
| 85 | + |
81 | 86 | } |
82 | | - */ |
83 | | - |
84 | | - return f; |
| 87 | + return fileFilters; |
85 | 88 | } |
86 | 89 |
|
87 | 90 | private function onSelect(e:Event) { |
|
0 commit comments