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

Ensure HTMLEditor can load vendor css

Browse Source
This commit is contained in:
Damian Mooyman 2017-10-03 13:08:22 +13:00
parent f64c95b33c
commit cdefd19091
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ use SilverStripe\Core\Convert;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Manifest\Module; use SilverStripe\Core\Manifest\Module;
use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Core\Manifest\ModuleResourceLoader;
use SilverStripe\Dev\Deprecation; use SilverStripe\Dev\Deprecation;
use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18n;
use SilverStripe\View\Requirements; use SilverStripe\View\Requirements;
@ -630,7 +631,9 @@ class TinyMCEConfig extends HTMLEditorConfig
$editorCSSFiles = $this->config()->get('editor_css'); $editorCSSFiles = $this->config()->get('editor_css');
if ($editorCSSFiles) { if ($editorCSSFiles) {
foreach ($editorCSSFiles as $editorCSS) { foreach ($editorCSSFiles as $editorCSS) {
$editor[] = Director::absoluteURL($this->resolvePath($editorCSS)); $path = ModuleResourceLoader::singleton()
->resolveURL($editorCSS);
$editor[] = Director::absoluteURL($path);
} }
} }
@ -692,7 +695,8 @@ class TinyMCEConfig extends HTMLEditorConfig
{ {
$configDir = static::config()->get('base_dir'); $configDir = static::config()->get('base_dir');
if ($configDir) { if ($configDir) {
return $this->resolvePath($configDir, true); return ModuleResourceLoader::singleton()
->resolveURL($configDir);
} }
throw new Exception(sprintf( throw new Exception(sprintf(
@ -709,7 +713,8 @@ class TinyMCEConfig extends HTMLEditorConfig
{ {
$configDir = static::config()->get('base_dir'); $configDir = static::config()->get('base_dir');
if ($configDir) { if ($configDir) {
return $this->resolvePath($configDir); return ModuleResourceLoader::singleton()
->resolveURL($configDir);
} }
throw new Exception(sprintf( throw new Exception(sprintf(
@ -727,27 +732,4 @@ class TinyMCEConfig extends HTMLEditorConfig
Deprecation::notice('5.0', 'Set base_dir or editor_css config instead'); Deprecation::notice('5.0', 'Set base_dir or editor_css config instead');
return ModuleLoader::getModule('silverstripe/admin'); return ModuleLoader::getModule('silverstripe/admin');
} }
/**
* Expand resource path to a relative filesystem path
*
* @param string $path
* @param boolean $useResourcePath The resource path can be different than the original tinymce location.
* @return string
*/
protected function resolvePath($path, $useResourcePath = false)
{
if (preg_match('#(?<module>[^/]+/[^/]+)\s*:\s*(?<path>[^:]+)#', $path, $results)) {
$module = ModuleLoader::getModule($results['module']);
if ($module) {
if ($useResourcePath) {
return $module->getResource($results['path'])->getURL();
} else {
return $module->getResource($results['path'])->getRelativePath();
}
}
}
return $path;
}
} }