mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
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
This commit is contained in:
parent
6b1f258c44
commit
8fe62100c6
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user