tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 09:05:53 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Use underscores in names of combined .js (#3581)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Luke Hudson 2010-02-25 02:32:23 +00:00 committed by Sam Minnee
parent 6b1f258c44
commit 8fe62100c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/LeftAndMain.php
View File

@ -241,7 +241,7 @@ class LeftAndMain extends Controller {
// Javascript combined files // Javascript combined files
Requirements::combine_files( Requirements::combine_files(
'assets/base.js', 'assets/_base.js',
array( array(
THIRDPARTY_DIR . '/prototype/prototype.js', THIRDPARTY_DIR . '/prototype/prototype.js',
THIRDPARTY_DIR . '/behaviour/behaviour.js', THIRDPARTY_DIR . '/behaviour/behaviour.js',
@ -257,7 +257,7 @@ class LeftAndMain extends Controller {
); );
Requirements::combine_files( Requirements::combine_files(
'assets/leftandmain.js', 'assets/_leftandmain.js',
array( array(
SAPPHIRE_DIR . '/javascript/loader.js', SAPPHIRE_DIR . '/javascript/loader.js',
CMS_DIR . '/javascript/hover.js', CMS_DIR . '/javascript/hover.js',
@ -278,7 +278,7 @@ class LeftAndMain extends Controller {
); );
Requirements::combine_files( Requirements::combine_files(
'assets/cmsmain.js', 'assets/_cmsmain.js',
array( array(
CMS_DIR . '/javascript/CMSMain.js', CMS_DIR . '/javascript/CMSMain.js',
CMS_DIR . '/javascript/CMSMain_left.js', CMS_DIR . '/javascript/CMSMain_left.js',