mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-04 23:28:48 +02:00
BUGFIX: Use underscores in names of combined .js (#3581) (from r99887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111616 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
325a57eea6
commit
a1cbf0cddf
@ -271,7 +271,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(
|
||||||
'sapphire/thirdparty/prototype/prototype.js',
|
'sapphire/thirdparty/prototype/prototype.js',
|
||||||
'sapphire/thirdparty/behaviour/behaviour.js',
|
'sapphire/thirdparty/behaviour/behaviour.js',
|
||||||
@ -285,7 +285,7 @@ class LeftAndMain extends Controller {
|
|||||||
);
|
);
|
||||||
|
|
||||||
Requirements::combine_files(
|
Requirements::combine_files(
|
||||||
'assets/leftandmain.js',
|
'assets/_leftandmain.js',
|
||||||
array(
|
array(
|
||||||
'sapphire/thirdparty/scriptaculous/effects.js',
|
'sapphire/thirdparty/scriptaculous/effects.js',
|
||||||
'sapphire/thirdparty/scriptaculous/dragdrop.js',
|
'sapphire/thirdparty/scriptaculous/dragdrop.js',
|
||||||
@ -298,7 +298,7 @@ class LeftAndMain extends Controller {
|
|||||||
);
|
);
|
||||||
|
|
||||||
Requirements::combine_files(
|
Requirements::combine_files(
|
||||||
'assets/cmsmain.js',
|
'assets/_cmsmain.js',
|
||||||
array(
|
array(
|
||||||
'cms/javascript/CMSMain_left.js',
|
'cms/javascript/CMSMain_left.js',
|
||||||
'cms/javascript/CMSMain_right.js',
|
'cms/javascript/CMSMain_right.js',
|
||||||
|
Loading…
Reference in New Issue
Block a user