From b9bbecdbee21784b192394d1dcb08a9e8f98b7f9 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 30 Nov 2009 01:46:37 +0000 Subject: [PATCH] MINOR: Use jquery instead of prototype for silverstripenavigator (from r93966) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93973 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentController.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/core/control/ContentController.php b/core/control/ContentController.php index a8c6a82c1..aac155d21 100755 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -290,18 +290,20 @@ class ContentController extends Controller { if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain')) { Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); - Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); - // Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::customScript(<<