From d5f5e1466e4b8adeb2277ba83acec90994b147fa Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 20 May 2010 07:28:10 +0000 Subject: [PATCH] MINOR Removed jquery.livequery as a Requirement from LeftAndMain.php, its only necessary in SecurityAdmin for MemberImportForm.js now. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105267 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 2 -- code/SecurityAdmin.php | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 96d6afc3..2fa501a5 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -200,7 +200,6 @@ class LeftAndMain extends Controller { Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/loader.js'); @@ -257,7 +256,6 @@ class LeftAndMain extends Controller { THIRDPARTY_DIR . '/behaviour/behaviour.js', SAPPHIRE_DIR . '/javascript/prototype_improvements.js', THIRDPARTY_DIR .'/jquery/jquery.js', - THIRDPARTY_DIR .'/jquery-livequery/jquery.livequery.js', THIRDPARTY_DIR . '/jquery-effen/jquery.fn.js', SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js', SAPPHIRE_DIR . '/javascript/jquery_improvements.js', diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index d94e555b..a6f86b5b 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -42,6 +42,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { Requirements::javascript(CMS_DIR . '/javascript/hover.js'); Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); + Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js'); // needed for MemberTableField (Requirements not determined before Ajax-Call) Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');