fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-29 16:19:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #865 set height of CKEditor container more intelligently

Browse source
This commit is contained in:
Kijin Sung 2017-07-05 12:21:52 +09:00
parent aed5c0fc6a
commit 6a9c82284d
2 changed files with 7 additions and 1 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,9 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" /> <input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
<!--@end--> <!--@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:{$editor_height}px;"></div> {@ $editor_height_fixed = $editor_height + ($editor_toolbar_hide ? 58 : ($editor_toolbar === 'simple' ? 74 : 140))}
<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_fixed}px;"></div>
<p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p> <p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>

4
modules/editor/tpl/js/editor.app.js
View file

@ -143,6 +143,10 @@ function getAutoSavedSrl(ret_obj, response_tags, c) {
if(!opts.enableToolbar) instance.config.toolbar = []; if(!opts.enableToolbar) instance.config.toolbar = [];
}); });
instance.on('instanceReady', function(e) {
$containerEl.css("min-height", 0);
});
instance.on('paste', function(e) { instance.on('paste', function(e) {
if (e.data && e.data.dataValue && e.data.dataValue.replace) { if (e.data && e.data.dataValue && e.data.dataValue.replace) {
e.data.dataValue = e.data.dataValue.replace(/&lt;(iframe|object)\s[^<>]+&lt;\/\1&gt;/g, function(m) { e.data.dataValue = e.data.dataValue.replace(/&lt;(iframe|object)\s[^<>]+&lt;\/\1&gt;/g, function(m) {