From 79ce73c75731af12d94e13e0f257fbbfb83da772 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 4 Mar 2010 23:10:38 +0000 Subject: [PATCH] MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 025a4e2b..41bdae91 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -241,7 +241,7 @@ class LeftAndMain extends Controller { // Javascript combined files Requirements::combine_files( - 'assets/_base.js', + '_base.js', array( THIRDPARTY_DIR . '/prototype/prototype.js', THIRDPARTY_DIR . '/behaviour/behaviour.js', @@ -257,7 +257,7 @@ class LeftAndMain extends Controller { ); Requirements::combine_files( - 'assets/_leftandmain.js', + '_leftandmain.js', array( SAPPHIRE_DIR . '/javascript/loader.js', CMS_DIR . '/javascript/hover.js', @@ -278,7 +278,7 @@ class LeftAndMain extends Controller { ); Requirements::combine_files( - 'assets/_cmsmain.js', + '_cmsmain.js', array( CMS_DIR . '/javascript/CMSMain.js', CMS_DIR . '/javascript/CMSMain_left.js',