From 34f8f9eaf386aabaf575e48676af083eadf92464 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 03:18:55 +0000 Subject: [PATCH] MINOR Moved batch actions javascript from CMSMain.BatchAction.js to LeftAndMain.BatchActions.js to make it reuseable in AssetAdmin git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92798 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 2 ++ code/CMSMain.php | 2 +- .../{CMSMain.BatchActions.js => LeftAndMain.BatchActions.js} | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename javascript/{CMSMain.BatchActions.js => LeftAndMain.BatchActions.js} (100%) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 0bc88064..4728e34b 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -81,6 +81,8 @@ class AssetAdmin extends LeftAndMain { // needed for MemberTableField (Requirements not determined before Ajax-Call) Requirements::css(SAPPHIRE_DIR . "/css/ComplexTableField.css"); + Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.BatchActions.js'); + Requirements::javascript(CMS_DIR . "/javascript/AssetAdmin.DragDrop.js"); Requirements::javascript(CMS_DIR . "/javascript/AssetAdmin.js"); diff --git a/code/CMSMain.php b/code/CMSMain.php index 0aeee5d6..b3405fbf 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -81,7 +81,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr Requirements::javascript(CMS_DIR . '/javascript/CMSMain.js'); Requirements::javascript(CMS_DIR . '/javascript/CMSMain.Tree.js'); Requirements::javascript(CMS_DIR . '/javascript/CMSMain.EditForm.js'); - Requirements::javascript(CMS_DIR . '/javascript/CMSMain.BatchActions.js'); + Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.BatchActions.js'); Requirements::javascript(CMS_DIR . '/javascript/CMSMain.Translatable.js'); Requirements::css(CMS_DIR . '/css/CMSMain.css'); diff --git a/javascript/CMSMain.BatchActions.js b/javascript/LeftAndMain.BatchActions.js similarity index 100% rename from javascript/CMSMain.BatchActions.js rename to javascript/LeftAndMain.BatchActions.js