MINOR Wrapped AssetAdmin.BatchActions javascript in document.load

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92818 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Nov 21, 2009 · 615494f · 615494f
1 parent 90c6c08
commit 615494f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
@@ -16,33 +16,25 @@ var _HANDLER_FORMS = {
 };
 
 (function($) {
-	$('.AssetAdmin').concrete('ss', function($) {
-		return {
-			onmatch: function() {
-
-				this._super();
-			}
-		};
-	});
-
+
 	/**
 	 * Delete selected folders through "batch actions" tab.
 	 */
-	$('#Form_BatchActionsForm').concrete('ss').register(
-		'admin/assets/batchactions/delete', 
-		function(ids) {
-			var confirmed = confirm(
-				ss.i18n.sprintf(
-					ss.i18n._t(
-						'AssetAdmin.BATCHACTIONSDELETECONFIRM',
-						"Do you really want to delete %d folders?"
-					),
-					ids.length
-				)
-			);
-			return (confirmed) ? ids : false;
-		}
-	);
+	$(function() {
+		$('#Form_BatchActionsForm').concrete('ss').register(
+			// TODO Hardcoding of base URL
+			'admin/assets/batchactions/delete', 
+			function(ids) {
+				var confirmed = confirm(
+					ss.i18n.sprintf(
+						ss.i18n._t('AssetAdmin.BATCHACTIONSDELETECONFIRM'),
+						ids.length
+					)
+				);
+				return (confirmed) ? ids : false;
+			}
+		);
+	});
 
 	$('#Form_SyncForm').concrete('ss', function($) {
 		return {

diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
@@ -28,6 +28,6 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'LeftAndMain.CONFIRMUNSAVEDSHORT': "WARNING: Your changes have not been saved.",
 		'CMSMAIN.ALERTCLASSNAME': 'The page type will be updated after the page is saved',
 		'CMSMAIN.URLSEGMENTVALIDATION': 'URLs can only be made up of letters, digits and hyphens.',
-		'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Do you really want to delete %d folders?"
+		'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Do you really want to delete %s folders?"
 	});
 }