mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-10 04:24:14 +09:00
issue 1020: Apply a patch which fixed the freezing bug
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9926 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
b5f2a919c3
commit
2706a6acab
1 changed files with 22 additions and 23 deletions
|
|
@ -443,27 +443,7 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--@if($allow_fileupload)-->
|
<div id="fileUploader_{$editor_sequence}" class="fileUploader" cond="$allow_fileupload"><!--File upload zone-->
|
||||||
<!--%import("../../tpl/js/uploader.js")-->
|
|
||||||
<!--%import("../../tpl/js/swfupload.js")-->
|
|
||||||
<script type="text/javascript">//<![CDATA[
|
|
||||||
editorUploadInit(
|
|
||||||
{
|
|
||||||
"editorSequence" : {$editor_sequence},
|
|
||||||
"sessionName" : "{session_name()}",
|
|
||||||
"allowedFileSize" : "{$file_config->allowed_filesize}",
|
|
||||||
"allowedFileTypes" : "{$file_config->allowed_filetypes}",
|
|
||||||
"allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
|
|
||||||
"insertedFiles" : {(int)$files_count},
|
|
||||||
"replaceButtonID" : "swfUploadButton{$editor_sequence}",
|
|
||||||
"fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
|
|
||||||
"previewAreaID" : "preview_uploaded_{$editor_sequence}",
|
|
||||||
"uploaderStatusID" : "uploader_status_{$editor_sequence}"
|
|
||||||
}
|
|
||||||
);
|
|
||||||
//]]></script>
|
|
||||||
<!-- 파일 업로드 영역 -->
|
|
||||||
<div id="fileUploader_{$editor_sequence}" class="fileUploader">
|
|
||||||
<div class="preview {$btn_class}" id="preview_uploaded_{$editor_sequence}"></div>
|
<div class="preview {$btn_class}" id="preview_uploaded_{$editor_sequence}"></div>
|
||||||
<div class="fileListArea {$btn_class}">
|
<div class="fileListArea {$btn_class}">
|
||||||
<select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="fileList" title="Attached File List"><option></option></select>
|
<select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="fileList" title="Attached File List"><option></option></select>
|
||||||
|
|
@ -475,13 +455,32 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="file_attach_info" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
|
<div class="file_attach_info" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
|
||||||
</div>
|
</div>
|
||||||
<!--@end-->
|
|
||||||
</div>
|
</div>
|
||||||
<!-- 에디터 활성화 -->
|
<!-- 에디터 활성화 -->
|
||||||
<script type="text/javascript">//<![CDATA[
|
<script type="text/javascript">//<![CDATA[
|
||||||
var editor_path = "{$editor_path}";
|
var editor_path = "{$editor_path}";
|
||||||
var auto_saved_msg = "{$lang->msg_auto_saved}";
|
var auto_saved_msg = "{$lang->msg_auto_saved}";
|
||||||
var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}", "{$colorset}", "{$content_style}",'{$content_font}','{$content_font_size}');
|
var oEditor;
|
||||||
|
jQuery(function(){
|
||||||
|
oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}", "{$colorset}", "{$content_style}",'{$content_font}','{$content_font_size}');
|
||||||
|
|
||||||
|
<!--@if($allow_file_upload)-->
|
||||||
|
<load target="../../tpl/js/uploader.js" />
|
||||||
|
<load target="../../tpl/js/swfupload.js" />
|
||||||
|
editorUploadInit({
|
||||||
|
"editorSequence" : {$editor_sequence},
|
||||||
|
"sessionName" : "{session_name()}",
|
||||||
|
"allowedFileSize" : "{$file_config->allowed_filesize}",
|
||||||
|
"allowedFileTypes" : "{$file_config->allowed_filetypes}",
|
||||||
|
"allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
|
||||||
|
"insertedFiles" : {(int)$files_count},
|
||||||
|
"replaceButtonID" : "swfUploadButton{$editor_sequence}",
|
||||||
|
"fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
|
||||||
|
"previewAreaID" : "preview_uploaded_{$editor_sequence}",
|
||||||
|
"uploaderStatusID" : "uploader_status_{$editor_sequence}"
|
||||||
|
});
|
||||||
|
<!--@end-->
|
||||||
|
});
|
||||||
//]]></script>
|
//]]></script>
|
||||||
|
|
||||||
<!--@end-->
|
<!--@end-->
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue