From c2e1c12bba14a8e14bb63fa69aaaba4253497bb0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 21 Nov 2009 03:19:08 +0000
Subject: [PATCH] MINOR Moved 'delete files' logic from AssetAdmin.DragDrop.js
 into AssetTableField.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92803 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 javascript/AssetAdmin.DragDrop.js | 39 -----------------------------
 javascript/AssetTableField.js     | 41 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/javascript/AssetAdmin.DragDrop.js b/javascript/AssetAdmin.DragDrop.js
index 4482996a..abeb6b88 100644
--- a/javascript/AssetAdmin.DragDrop.js
+++ b/javascript/AssetAdmin.DragDrop.js
@@ -1,42 +1,3 @@
-MarkingPropertiesButton = Class.create();
-MarkingPropertiesButton.applyTo('#Form_EditForm_deletemarked', "Please select some files to delete!", 'deletemarked', 'Do you really want to delete the marked files?');
-
-MarkingPropertiesButton.prototype = {
-	initialize: function(noneCheckedError, action, confirmMessage) {
-		this.noneCheckedError = noneCheckedError;
-		this.action = action;
-		this.confirmMessage = confirmMessage;
-	},
-	
-	onclick: function() {
-		var i, list = "", checkboxes = $('Form_EditForm').elements['Files[]'];
-		if(!checkboxes) checkboxes = [];
-		if(!checkboxes.length) checkboxes = [ checkboxes ];
-		for(i=0;i<checkboxes.length;i++) {
-			if(checkboxes[i].checked) list += (list?',':'') + checkboxes[i].value;
-		}
-		
-		if(list == "") {
-			alert(this.noneCheckedError);
-			return false;
-			
-		} else {
-			$('Form_EditForm_FileIDs').value = list;
-		}
-		// If there is a confirmation message, show it before submitting
-		if('' != this.confirmMessage) {
-			// Only submit if OK button is clicked
-			if (confirm(this.confirmMessage)) {
-				$('Form_EditForm').save(false, null, this.action);
-			}
-		} else {
-			$('Form_EditForm').save(false, null, this.action);
-		}
-		return false;
-	}
-}
-
-
 // CheckBoxRange adapted from: http://jroller.com/page/rmcmahon?entry=checkboxrange_with_prototype
 var CheckBoxRange = Class.create();
 
diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 85205309..594d724f 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -94,4 +94,45 @@ FileFilterButton.prototype = {
 
 		return false;	
 	}
+}
+
+MarkingPropertiesButton = Class.create();
+MarkingPropertiesButton.applyTo(
+	'#Form_EditForm_deletemarked', 
+	"Please select some files to delete!", 'deletemarked', 'Do you really want to delete the marked files?'
+);
+
+MarkingPropertiesButton.prototype = {
+	initialize: function(noneCheckedError, action, confirmMessage) {
+		this.noneCheckedError = noneCheckedError;
+		this.action = action;
+		this.confirmMessage = confirmMessage;
+	},
+	
+	onclick: function() {
+		var i, list = "", checkboxes = $('Form_EditForm').elements['Files[]'];
+		if(!checkboxes) checkboxes = [];
+		if(!checkboxes.length) checkboxes = [ checkboxes ];
+		for(i=0;i<checkboxes.length;i++) {
+			if(checkboxes[i].checked) list += (list?',':'') + checkboxes[i].value;
+		}
+		
+		if(list == "") {
+			alert(this.noneCheckedError);
+			return false;
+			
+		} else {
+			$('Form_EditForm_FileIDs').value = list;
+		}
+		// If there is a confirmation message, show it before submitting
+		if('' != this.confirmMessage) {
+			// Only submit if OK button is clicked
+			if (confirm(this.confirmMessage)) {
+				$('Form_EditForm').save(false, null, this.action);
+			}
+		} else {
+			$('Form_EditForm').save(false, null, this.action);
+		}
+		return false;
+	}
 }
\ No newline at end of file