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

BUGFIX Checking file existence in LeftAndMain->init() for TinyMCE's content_css settings to avoid unnecessary clientside loading of files

Browse Source
This commit is contained in:
Ingo Schommer 2011-04-15 10:34:05 +12:00
parent b273861591
commit 8183cc7117
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/code/LeftAndMain.php
View File

@ -169,7 +169,8 @@ class LeftAndMain extends Controller {
$htmlEditorConfig = HtmlEditorConfig::get_active(); $htmlEditorConfig = HtmlEditorConfig::get_active();
$htmlEditorConfig->setOption('language', i18n::get_tinymce_lang()); $htmlEditorConfig->setOption('language', i18n::get_tinymce_lang());
if(!$htmlEditorConfig->getOption('content_css')) { if(!$htmlEditorConfig->getOption('content_css')) {
$cssFiles = 'sapphire/admin/css/editor.css'; $cssFiles = array();
$cssFiles[] = 'sapphire/admin/css/editor.css';
// Use theme from the site config // Use theme from the site config
if(class_exists('SiteConfig') && ($config = SiteConfig::current_site_config()) && $config->Theme) { if(class_exists('SiteConfig') && ($config = SiteConfig::current_site_config()) && $config->Theme) {
@ -180,10 +181,15 @@ class LeftAndMain extends Controller {
$theme = false; $theme = false;
} }
if($theme) $cssFiles .= ',' . THEMES_DIR . "/{$theme}/css/editor.css"; if($theme) $cssFiles[] = THEMES_DIR . "/{$theme}/css/editor.css";
else if(project()) $cssFiles .= ',' . project() . '/css/editor.css'; else if(project()) $cssFiles[] = project() . '/css/editor.css';
$htmlEditorConfig->setOption('content_css', $cssFiles); // Remove files that don't exist
foreach($cssFiles as $k => $cssFile) {
if(!file_exists(BASE_PATH . '/' . $cssFile)) unset($cssFiles[$k]);
}
$htmlEditorConfig->setOption('content_css', implode(',', $cssFiles));
} }
Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css'); Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');