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

#1086 업로드 경로 설정 등 문제 수정

Browse source
This commit is contained in:
bnu 2015-02-27 11:31:59 +09:00
parent 8731b3cd8a
commit 052262c196
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,24 +16,34 @@
this.editor_sequence = $container.data('editor-sequence'); this.editor_sequence = $container.data('editor-sequence');
var settings = { var settings = {
url: '/core-origin/index.php?act=procFileUpload&module=file', url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
autoUpload: true, autoUpload: true,
formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl}, formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl},
dataType: 'json', dataType: 'json',
dropZone: $container, dropZone: $container,
done: function() { done: function(e, res) {
self.done.call(self, arguments); var result = res.result;
this.uploadedBytes += res.fi
if(result.error == 0) {
this.uploadedBytes += res.total;
self.done.call(self, arguments);
} else {
alert(result.message);
}
},
stop: function() {
self.loadFilelist();
}, },
start: function() { start: function() {
$('#progress').show(); $('#progress').find('.progress-bar').width(0).addBack().show();
}, },
progressall: function (e, data) { progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10); var progress = parseInt(data.loaded / data.total * 100, 10);
$('#progress .progress-bar').width(progress+'%'); $('.progress-bar').width(progress+'%');
if(progress >= 100) { if(progress >= 100) {
$('#progress').delay(5000).slideUp(); $('#progress').delay(5000).slideUp();
self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo'));
} }
} }
}; };
@ -66,7 +76,6 @@
this.loadFilelist(); this.loadFilelist();
// 본문 삽입 // 본문 삽입
$('.xe-act-link-selected').on('click', function() { $('.xe-act-link-selected').on('click', function() {
self.insertToContent(); self.insertToContent();
@ -76,12 +85,9 @@
$('.xe-act-delete-selected').on('click', function() { $('.xe-act-delete-selected').on('click', function() {
self.deleteFile(); self.deleteFile();
}); });
}, },
done: function() { done: function() {
this.loadFilelist(); // this.loadFilelist();
}, },
insertToContent: function() { insertToContent: function() {
for(var i = 0, len = this.selected_files.length; i < len; i++) { for(var i = 0, len = this.selected_files.length; i < len; i++) {
@ -125,13 +131,15 @@
.val(file.file_srl) .val(file.file_srl)
.appendTo('.xe-uploader-filelist select'); .appendTo('.xe-uploader-filelist select');
}); });
// self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo')); self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo'));
}); });
}, },
selectFile: function() { selectFile: function() {
this.displayPreview($(this.last_selected_file).data('fileinfo')); this.displayPreview($(this.last_selected_file).data('fileinfo'));
}, },
displayPreview: function(fileinfo) { displayPreview: function(fileinfo) {
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);
} else { } else {

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

@ -59,7 +59,11 @@
<script> <script>
(function($) {/**/ (function($) {/**/
$(function () {/**/ $(function () {/**/
var uploader = $('#fileUploaderContainer_{$editor_sequence}').xeUploader(); var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize},
};
var uploader = $('#fileUploaderContainer_{$editor_sequence}').xeUploader(setting);
}); });
}) (jQuery); }) (jQuery);
</script> </script>

1
modules/file/file.controller.php
View file

@ -45,6 +45,7 @@ class fileController extends file
$output = $this->insertFile($file_info, $module_srl, $upload_target_srl); $output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
Context::setResponseMethod('JSON'); Context::setResponseMethod('JSON');
if($output->error != '0') $this->stop($output->message);
} }
/** /**