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

Merge #1651 fix #1648 CKEditor에도 자동 저장 기능 추가 by YJSoft

Browse source 
* pr/1651:
  조건문을 더 간단히 수정
  0 Check Fix
  Dummy commit to trigger Travis CI update
  fix #1648 CKEditor에도 자동 저장 기능 추가

Conflicts:
	modules/editor/skins/ckeditor/file_upload.html
This commit is contained in:
Kijin Sung 2015-10-08 15:07:01 +09:00
commit 8a034adae1
4 changed files with 77 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/editor/skins/ckeditor/css/default.css
View file

@ -0,0 +1 @@
p.editor_autosaved_message.autosave_message {display:none;background: #f6ffdb;padding:6px 10px;margin:0;line-height:1;}

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

@ -8,6 +8,10 @@
<load target="../../tpl/js/editor.app.js" />
<load target="js/xe_interface.js" />
<script>
var auto_saved_msg = "{$lang->msg_auto_saved}";
</script>
{@ $css_content = null }
<!--@if($content_font || $content_font_size)-->
<!--@if($content_style === 'ckeditor_light')-->{@ $css_content = '.xe_content.editable p { margin: 0;'. chr(125); }<!--@endif-->
@ -23,8 +27,17 @@
{@ $css_content .= chr(125);}
<!--@endif-->
<!--@if($enable_autosave)-->
<input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" />
<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" />
<input type="hidden" name="_saved_doc_document_srl" value="{$saved_doc->document_srl}" />
<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:{$editor_height}px;"></div>
<p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
<block cond="$allow_fileupload">
<include target="file_upload.html" />
</block>

38
modules/editor/skins/ckeditor/file_upload.html
View file

@ -44,36 +44,28 @@
</div>
<script>
<script cond="$allow_fileupload">
function reloadUploader(editor_sequence){
jQuery(function($){
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize}
};
var uploader = $('#xefu-container-' + editor_sequence).xeUploader(setting);
});
}
jQuery(function($){
// uploader
<!--@if($allow_fileupload)-->
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize}
};
var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting);
window.xe.msg_exceeds_limit_size = '{$lang->msg_exceeds_limit_size}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_file_cart_is_null = '{$lang->msg_file_cart_is_null}';
window.xe.msg_checked_file_is_deleted = '{$lang->msg_checked_file_is_deleted}';
window.xe.msg_not_allowed_filetype = '{$lang->msg_not_allowed_filetype}';
window.xe.msg_file_upload_error = '{$lang->msg_file_upload_error}';
window.xe.cmd_select = '{$lang->cmd_select}';
window.xe.cmd_select_cover = '{$lang->cmd_select_cover}';
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize},
tmplXeUploaderFileitem : '<li class="xefu-file xe-clearfix" data-file-srl="{{file_srl}}"><span class="xefu-file-name">{{source_filename}}</span><span class="xefu-file-info"><span>{{disp_file_size}}</span><span><input type="checkbox" data-file-srl="{{file_srl}}"> Select</span></span></li>',
tmplXeUploaderFileitemImage: '<li class="xefu-file xefu-file-image {{#if cover_image}}xefu-is-cover-image{{/if}}" data-file-srl="{{file_srl}}"><strong class="xefu-file-name">{{source_filename}}</strong><span class="xefu-file-info"><span class="xefu-file-size">{{disp_file_size}}</span><span><img src="{{download_url}}" alt=""></span><span><input type="checkbox" data-file-srl="{{file_srl}}"></span><button class="xefu-act-set-cover" data-file-srl="{{file_srl}}" title="Be a cover image"><i class="xi-check-circle"></i></button></span></li>'
};
if(typeof window.xe.cmd_select != "undefined" && window.xe.cmd_select !== "")
{
setting.tmplXeUploaderFileitem = setting.tmplXeUploaderFileitem.replace("Select", window.xe.cmd_select);
}
if(typeof window.xe.cmd_select_cover != "undefined" && window.xe.cmd_select_cover !== "")
{
setting.tmplXeUploaderFileitemImage = setting.tmplXeUploaderFileitemImage.replace("Be a cover image", window.xe.cmd_select_cover);
}
var uploader = $('#xefu-container-{$editor_sequence}').xeUploader(setting);
<!--@endif-->
});
</script>