fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Always fill default font information

Browse source
This commit is contained in:
Kijin Sung 2016-05-05 11:18:45 +09:00
parent 007d563f34
commit b36ec1bd68
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/editor/editor.controller.php
View file

@ -159,8 +159,15 @@ class editorController extends editor
$module_srl = $module_info->module_srl; $module_srl = $module_info->module_srl;
if($module_srl) if($module_srl)
{ {
$oEditorModel = getModel('editor'); $editor_config = getModel('editor')->getEditorConfig($module_srl);
$editor_config = $oEditorModel->getEditorConfig($module_srl); }
else
{
$editor_config = getModel('module')->getModuleConfig('editor');
}
if ($editor_config)
{
$content_style = $editor_config->content_style; $content_style = $editor_config->content_style;
if($content_style) if($content_style)
{ {
@ -222,6 +229,16 @@ class editorController extends editor
Context::addHtmlHeader(implode(' ', $buff)); Context::addHtmlHeader(implode(' ', $buff));
*/ */
} }
else
{
Context::set('default_font_config', array(
'default_font_family' => 'inherit',
'default_font_size' => '13px',
'default_line_height' => '160%',
'default_paragraph_spacing' => '0',
'default_word_break' => 'normal',
));
}
$content = $this->transComponent($content); $content = $this->transComponent($content);
return new Object(); return new Object();