From 8fe62100c6fbfa2e0e99862c829e5f7d72558d33 Mon Sep 17 00:00:00 2001 From: Luke Hudson Date: Thu, 25 Feb 2010 02:32:23 +0000 Subject: [PATCH] BUGFIX: Use underscores in names of combined .js (#3581) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 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 ed47f71a..49ab34c7 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', + 'assets/_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', + 'assets/_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', + 'assets/_cmsmain.js', array( CMS_DIR . '/javascript/CMSMain.js', CMS_DIR . '/javascript/CMSMain_left.js',