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

#1086 본문 삽입 시 이미지 외 파일 추가 지원 및 미리보기 등 문제 수정

Browse source
This commit is contained in:
bnu 2015-03-10 15:08:25 +09:00
parent d72a4d07a4
commit b04e8c5955
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -13,7 +13,7 @@
var self = this; var self = this;
var $container = this.$container = containerEl; var $container = this.$container = containerEl;
var data = $container.data(); var data = $container.data();
this.editor_sequence = $container.data('editor-sequence'); this.editor_sequence = data.editorSequence;
var settings = { var settings = {
url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'), url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
@ -24,8 +24,9 @@
done: function(e, res) { done: function(e, res) {
var result = res.result; var result = res.result;
if(!result) return;
if(result.error == 0) { if(result.error == 0) {
this.uploadedBytes += res.total;
self.done.call(self, arguments); self.done.call(self, arguments);
} else { } else {
alert(result.message); alert(result.message);
@ -90,21 +91,27 @@
// this.loadFilelist(); // this.loadFilelist();
}, },
insertToContent: function() { insertToContent: function() {
var temp_code = '';
for(var i = 0, len = this.selected_files.length; i < len; i++) { for(var i = 0, len = this.selected_files.length; i < len; i++) {
var fileinfo = $(this.selected_files[i]).data('fileinfo'); var fileinfo = $(this.selected_files[i]).data('fileinfo');
var temp_code = '';
if(!fileinfo) return; if(!fileinfo) return;
if(/\.(jpg|jpeg|png|gif)$/i.test(fileinfo.download_url)) { if(/\.(jpe?g|png|gif)$/i.test(fileinfo.download_url)) {
temp_code += '<img src="'+fileinfo.download_url+'" alt="'+fileinfo.source_filename+'" />' + "\r\n<br />"; temp_code += '<img src="' + window.request_uri + fileinfo.download_url + '" alt="' + fileinfo.source_filename + '" editor_component="image_link" />';
_getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html"); temp_code += "\r\n<p><br></p>\r\n";
} else {
temp_code += '<a href="' + window.request_uri + fileinfo.download_url + '">' + fileinfo.source_filename + "</a>\n";
} }
_getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html");
} }
}, },
deleteFile: function() { deleteFile: function() {
var self = this; var self = this;
var file_srls = []; var file_srls = [];
for(var i = 0, len = this.selected_files.length; i < len; i++) { for(var i = 0, len = this.selected_files.length; i < len; i++) {
var fileinfo = $(this.selected_files[i]).data('fileinfo'); var fileinfo = $(this.selected_files[i]).data('fileinfo');
file_srls.push(fileinfo.file_srl); file_srls.push(fileinfo.file_srl);
@ -144,7 +151,7 @@
if(!fileinfo) return; if(!fileinfo) return;
if(/\.(jpe?g|png|gif)$/i.test(fileinfo.download_url)) { if(/\.(jpe?g|png|gif)$/i.test(fileinfo.download_url)) {
$('.xe-uploader-preview img').attr('src', window.request_uri + fileinfo.download_url); $('.xe-uploader-preview img').attr('src', window.request_uri + fileinfo.download_url).show();
} else { } else {
$('.xe-uploader-preview img').hide(); $('.xe-uploader-preview img').hide();
} }

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

@ -44,7 +44,7 @@
<!-- END:PROGRESS --> <!-- END:PROGRESS -->
<div class="xe-fileupload-controll"> <div class="xe-fileupload-controll">
<span class="btn fileinput-button"> <span class="btn fileinput-button">
<span>파일첨부</span> <span>{$lang->edit->upload_file}</span>
<input id="xe-fileupload" type="file" class="fileupload-processing" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple /> <input id="xe-fileupload" type="file" class="fileupload-processing" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
</span> </span>
<button type="button" class="btn xe-act-delete-selected">{$lang->edit->delete_selected}</button> <button type="button" class="btn xe-act-delete-selected">{$lang->edit->delete_selected}</button>
@ -100,8 +100,8 @@
<!--@if($allow_fileupload)--> <!--@if($allow_fileupload)-->
$(function () {/**/ $(function () {/**/
var setting = { var setting = {
maxFileSize: {$file_config->allowed_filesize || 'null'}, maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize || 'null'}, limitMultiFileUploadSize: {$file_config->allowed_filesize}
}; };
var uploader = $('#xe-uploader-container-{$editor_sequence}').xeUploader(setting); var uploader = $('#xe-uploader-container-{$editor_sequence}').xeUploader(setting);
}); });