Fixed issue with Flash filters and fixed so they can be changed dynam…

…ically.
moxiecode · Apr 23, 2010 · fd8cdf3 · fd8cdf3
1 parent 5d8a931
commit fd8cdf3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/flash/plupload/src/com/plupload/Plupload.as b/src/flash/plupload/src/com/plupload/Plupload.as
@@ -227,7 +227,7 @@ package com.plupload {
 				for (i = 0; i < this.fileFilters.length; i++) {
 					filters.push(new FileFilter(
 						this.fileFilters[i].title,
-						this.fileFilters[i].extensions,
+						'*.' + this.fileFilters[i].extensions.replace(/,/g, ";*."),
 						this.fileFilters[i].mac_types
 					));
 				}

diff --git a/src/javascript/plupload.flash.js b/src/javascript/plupload.flash.js
@@ -135,16 +135,10 @@
 
 			// Wait for Flash to send init event
 			uploader.bind("Flash:Init", function() {
-				var lookup = {}, i, filters = uploader.settings.filters, resize = uploader.settings.resize || {};
+				var lookup = {}, i, resize = uploader.settings.resize || {};
 
 				initialized = true;
-
-				// Convert extensions to flash format
-				for (i = 0; i < filters.length; i++) {
-					filters[i].extensions = "*." + filters[i].extensions.replace(/,/g, ";*.");
-				}
-
-				getFlashObj().setFileFilters(filters, uploader.settings.multi_selection);
+				getFlashObj().setFileFilters(uploader.settings.filters, uploader.settings.multi_selection);
 
 				uploader.bind("UploadFile", function(up, file) {
 					var settings = up.settings;
@@ -265,6 +259,9 @@
 				uploader.bind("Refresh", function(up) {
 					var browseButton, browsePos, browseSize;
 
+					// Set file filters incase it has been changed dynamically
+					getFlashObj().setFileFilters(uploader.settings.filters, uploader.settings.multi_selection);
+
 					browseButton = document.getElementById(up.settings.browse_button);
 					browsePos = plupload.getPos(browseButton, document.getElementById(up.settings.container));
 					browseSize = plupload.getSize(browseButton);