tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Allow editor themes to fall back safely

Browse Source
This commit is contained in:
Damian Mooyman 2017-07-03 10:38:30 +12:00
parent cddaaf1444
commit 92903d883e
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Forms/HTMLEditor/HTMLEditorConfig.php
View File

@ -52,7 +52,10 @@ abstract class HTMLEditorConfig
private static $default_config = 'default'; private static $default_config = 'default';
/** /**
* @var List of themes defined for the frontend * List of themes defined for the frontend
*
* @config
* @var array
*/ */
private static $user_themes = []; private static $user_themes = [];
@ -108,7 +111,7 @@ abstract class HTMLEditorConfig
*/ */
public static function get_active_identifier() public static function get_active_identifier()
{ {
$identifier = self::$current ?: static::config()->default_config; $identifier = self::$current ?: static::config()->get('default_config');
return $identifier; return $identifier;
} }
@ -152,15 +155,6 @@ abstract class HTMLEditorConfig
return $configs; return $configs;
} }
/**
* Set user defined (non-admin) themes
* @param array $themes
*/
public static function set_user_themes($themes)
{
self::config()->set('user_themes', $themes);
}
/** /**
* Get the current value of an option * Get the current value of an option
* *

4
src/Forms/HTMLEditor/TinyMCEConfig.php
View File

@ -616,8 +616,10 @@ class TinyMCEConfig extends HTMLEditorConfig
// Add standard editor.css // Add standard editor.css
$editor[] = $this->getAdminModule()->getResourceURL('client/dist/styles/editor.css'); $editor[] = $this->getAdminModule()->getResourceURL('client/dist/styles/editor.css');
// Themed editor.css // Themed editor.css
$themedEditor = ThemeResourceLoader::inst()->findThemedCSS('editor', $this->config()->user_themes); $themes = $this->config()->get('user_themes') ?: SSViewer::get_themes();
$themedEditor = ThemeResourceLoader::inst()->findThemedCSS('editor', $themes);
if ($themedEditor) { if ($themedEditor) {
$editor[] = Director::absoluteURL($themedEditor, Director::BASE); $editor[] = Director::absoluteURL($themedEditor, Director::BASE);
} }