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

MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-03-04 23:10:38 +00:00 committed by Sam Minnee
parent 98cec468b2
commit 79ce73c757
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
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',