From 33467b20115b1ed960f633ec8c12bac5fa7db6bf Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 13 Nov 2008 05:32:15 +0000
Subject: [PATCH] ENHANCEMENT Added error messages to flash uploader panel, to
 be consistent with the image uploader one BUGFIX Fixed flash uploader not
 searching for the correct files, due to changes in r65820

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65827 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ThumbnailStripField.php      | 8 +++++++-
 javascript/ThumbnailStripField.js | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php
index 5a7b619f..b72652d5 100755
--- a/code/ThumbnailStripField.php
+++ b/code/ThumbnailStripField.php
@@ -119,7 +119,7 @@ class ThumbnailStripField extends FormField {
 			$flashObjects = DataObject::get('File', $whereSQL);
 		} else {
 			if($searchText) {
-				$flashObjects = DataObject::get('File', "Filename LIKE '%$searchText%'");
+				$flashObjects = DataObject::get('File', "Filename LIKE '%$searchText%' AND Filename LIKE '%.swf'");
 			}
 		}
 		
@@ -137,6 +137,12 @@ class ThumbnailStripField extends FormField {
 HTML;
 			}
 			$result .= '</ul>';			
+		} else {
+			if($folder) {
+				$result = '<h2>' . _t('ThumbnailStripField.NOFOLDERFLASHFOUND', 'No flash files found in') . ' ' . $folder->Title . '</h2>';
+			} else {
+				$result = '<h2>' . _t('ThumbnailStripField.NOFLASHFOUND', 'No flash files found') . '</h2>';
+			}
 		}
 		
 		return $result;
diff --git a/javascript/ThumbnailStripField.js b/javascript/ThumbnailStripField.js
index 5c2bd396..f3b9cbf4 100755
--- a/javascript/ThumbnailStripField.js
+++ b/javascript/ThumbnailStripField.js
@@ -25,7 +25,9 @@ ThumbnailStripField.prototype = {
 				parentField.observeMethod('Change', this.ajaxGetFiles.bind(this));
 			}
 			
-			var searchField = $$('#' + this.updateMethod + 'Search input')[0];
+			console.debug(parentField);
+			
+			var searchField = $$('#' + this.updateMethod + 'Search input')[0];		
 			var timeout = undefined;
 			
 			if(searchField) {
@@ -35,6 +37,7 @@ ThumbnailStripField.prototype = {
 					timeout = setTimeout(function() {
 						var searchText = searchField.value;
 						
+						$('Flash').ajaxGetFiles(null, searchText);
 						$('Image').ajaxGetFiles(null, searchText);
 					}, 500);
 				});