fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-30 07:42:11 +09:00
Code Issues Projects Releases Packages Wiki Activity

Respect PC and mobile editor height settings in CKEditor and textarea

Browse source
This commit is contained in:
Kijin Sung 2017-06-27 17:42:28 +09:00
parent fcef0427e6
commit 0d257b6b67
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/skins/ckeditor/editor.html
View file

@ -36,7 +36,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
<!--@end-->
<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$m ? 160 : $editor_height}px;"></div>
<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$editor_height}px;"></div>
<p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
@ -91,7 +91,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
var settings = {
ckeconfig: {
height: '{$m ? 160 : $editor_height}',
height: '{$editor_height}',
skin: '{$colorset}',
contentsCss: {json_encode($css_file_list)},
xe_editor_sequence: {$editor_sequence},

1
modules/editor/skins/textarea/editor.html
View file

@ -11,6 +11,7 @@
textarea.css("font-family", {json_encode($content_font ?: null)});
textarea.css("font-size", {json_encode($content_font_size)});
textarea.css("line-height", {json_encode($content_line_height)});
textarea.height({intval($editor_height)});
if ({json_encode($content_word_break)} === 'none') {
textarea.css("white-space", "nowrap");
} else {