MINOR Removed individual Requirements calls in CMSMain->init() in fav…

…our 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
silverstripe · Oct 11, 2011 · 51a81bb · 51a81bb
1 parent 9016204
commit 51a81bb
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
@@ -57,28 +57,21 @@ public function init() {
 		}
 
 		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',
 				CMS_DIR . '/javascript/CMSPageHistoryController.js',
 				CMS_DIR . '/javascript/SilverStripeNavigator.js'
 			)
 		);
+		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang');
 
 		HtmlEditorField::include_js();