From 284de94770285dfe895692cc65e56f2da8671d80 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 21 Nov 2009 03:19:18 +0000
Subject: [PATCH] MINOR Moved some form logic from AssetAdmin.js to
 AssetTableField.js

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

diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 13770daf..2c50a134 100755
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -136,52 +136,4 @@ var _HANDLER_FORMS = {
 			}
 		};
 	});
-}(jQuery));
-
-
-Behaviour.register({
-	'#Form_EditForm_Files': {
-		removeFile : function(fileID) {
-			var record;
-			if(record = $('record-' + fileID)) {
-				record.parentNode.removeChild(record);
-			} 
-		}
-	},	
-	
-	'#Form_EditForm_Files a.deletelink' : {
-		onclick : function(event) {
-			// Send request
-			new Ajax.Request(this.href + (this.href.indexOf("?") == -1 ? "?" : "&") + "ajax=1", {
-				method : 'get',
-				onSuccess : Ajax.Evaluator,
-				onFailure : function(response) {errorMessage('Server Error', response);}
-			});
-			Event.stop(event);
-			return false;
-		}
-	},
-	
-	
-	'#Form_EditForm' : {
-		changeDetection_fieldsToIgnore : {
-			'Files[]' : true
-		}
-	}
-});
-
-/**
- * We don't want hitting the enter key in the name field
- * to submit the form.
- */
- Behaviour.register({
- 	'#Form_EditForm_Name' : {
- 		onkeypress : function(event) {
- 			event = (event) ? event : window.event;
- 			var kc = event.keyCode ? event.keyCode : event.charCode;
- 			if(kc == 13) {
- 				return false;
- 			}
- 		}
- 	}
- });
+}(jQuery));
\ No newline at end of file
diff --git a/javascript/AssetTableField.js b/javascript/AssetTableField.js
index 594d724f..57027f7d 100644
--- a/javascript/AssetTableField.js
+++ b/javascript/AssetTableField.js
@@ -135,4 +135,35 @@ MarkingPropertiesButton.prototype = {
 		}
 		return false;
 	}
-}
\ No newline at end of file
+}
+
+Behaviour.register({
+	'#Form_EditForm_Files': {
+		removeFile : function(fileID) {
+			var record;
+			if(record = $('record-' + fileID)) {
+				record.parentNode.removeChild(record);
+			} 
+		}
+	},	
+	
+	'#Form_EditForm_Files a.deletelink' : {
+		onclick : function(event) {
+			// Send request
+			new Ajax.Request(this.href + (this.href.indexOf("?") == -1 ? "?" : "&") + "ajax=1", {
+				method : 'get',
+				onSuccess : Ajax.Evaluator,
+				onFailure : function(response) {errorMessage('Server Error', response);}
+			});
+			Event.stop(event);
+			return false;
+		}
+	},
+	
+	
+	'#Form_EditForm' : {
+		changeDetection_fieldsToIgnore : {
+			'Files[]' : true
+		}
+	}
+});
\ No newline at end of file