tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR Removed individual Requirements calls in CMSMain->init() in favour of Requirements::combine_files(), to avoid duplication and hard to debug behaviour differences due to changed file inclusion orders between non-live and live systems

This commit is contained in:
Ingo Schommer 2011-10-11 09:56:07 +02:00
parent 9016204dec
commit 51a81bb258
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/controllers/CMSMain.php
View File

@ -57,21 +57,13 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
}
parent::init();
Requirements::javascript(CMS_DIR . '/javascript/CMSMain.js');
Requirements::javascript(CMS_DIR . '/javascript/CMSMain.EditForm.js');
Requirements::javascript(CMS_DIR . '/javascript/CMSMain.AddForm.js');
Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
Requirements::css(CMS_DIR . '/css/CMSMain.css');
// navigator
// Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css');
Requirements::javascript(CMS_DIR . '/javascript/SilverStripeNavigator.js');
Requirements::combine_files(
'cmsmain.js',
array(
CMS_DIR . '/javascript/ThumbnailStripField.js',
CMS_DIR . '/javascript/CMSMain.js',
CMS_DIR . '/javascript/CMSMain.EditForm.js',
CMS_DIR . '/javascript/CMSMain.AddForm.js',
@ -79,6 +71,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
CMS_DIR . '/javascript/SilverStripeNavigator.js'
)
);
Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
HtmlEditorField::include_js();