fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
bnu 2015-02-27 14:10:05 +09:00
parent 052262c196
commit d2d092a7eb
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,6 @@
dropZone: $container, dropZone: $container,
done: function(e, res) { done: function(e, res) {
var result = res.result; var result = res.result;
this.uploadedBytes += res.fi
if(result.error == 0) { if(result.error == 0) {
this.uploadedBytes += res.total; this.uploadedBytes += res.total;
@ -93,6 +92,9 @@
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 = ''; var temp_code = '';
if(!fileinfo) return;
if(/\.(jpg|jpeg|png|gif)$/i.test(fileinfo.download_url)) { if(/\.(jpg|jpeg|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="'+fileinfo.download_url+'" alt="'+fileinfo.source_filename+'" />' + "\r\n<br />";
_getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html"); _getCkeInstance(this.editor_sequence).insertHtml(temp_code, "unfiltered_html");

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

@ -25,14 +25,13 @@
<div id="ckeditor_instance_{$editor_sequence}"></div> <div id="ckeditor_instance_{$editor_sequence}"></div>
<!--%load_js_plugin("jquery.fileupload")--> <!--%load_js_plugin("jquery.fileupload")-->
<div id="fileUploaderContainer_{$editor_sequence}" class="xe-uploader-container clearfix" data-editor-sequence="{$editor_sequence}"> <div id="xe-uploader-container-{$editor_sequence}" class="xe-uploader-container clearfix" data-editor-sequence="{$editor_sequence}">
<div class="xe-uploader-preview"> <div class="xe-uploader-preview">
<img /> <img />
</div> </div>
<div style="display:inline-block; vertical-align:top;"> <div style="display:inline-block; vertical-align:top;">
<div class="xe-uploader-filelist" style=""> <div class="xe-uploader-filelist" style="">
<select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="" style="width: 300px;"> <select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="" style="width: 300px;">
</select> </select>
</div> </div>
@ -54,19 +53,6 @@
<div class="file_attach_info" style="display:inline-block;" id="uploader_status_{$editor_sequence}">{$upload_status}</div> <div class="file_attach_info" style="display:inline-block;" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
</div> </div>
</div> </div>
<script>
(function($) {/**/
$(function () {/**/
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize},
};
var uploader = $('#fileUploaderContainer_{$editor_sequence}').xeUploader(setting);
});
}) (jQuery);
</script>
</div> </div>
<script> <script>
@ -75,6 +61,7 @@
var editor_primary_key_name = '{$editor_primary_key_name}'; var editor_primary_key_name = '{$editor_primary_key_name}';
var editor_content_key_name = '{$editor_content_key_name}'; var editor_content_key_name = '{$editor_content_key_name}';
// editor
$(function(){ $(function(){
var pl = xe.getApp('xeEditorApp')[0].getPlugin('ckeditor')[0]; var pl = xe.getApp('xeEditorApp')[0].getPlugin('ckeditor')[0];
var editor_id = 'ckeditor_instance_{$editor_sequence}'; var editor_id = 'ckeditor_instance_{$editor_sequence}';
@ -130,6 +117,15 @@
var INS = pl.getInstance('{$editor_sequence}'); var INS = pl.getInstance('{$editor_sequence}');
}); });
// uploader
$(function () {/**/
var setting = {
maxFileSize: {$file_config->allowed_filesize},
limitMultiFileUploadSize: {$file_config->allowed_filesize},
};
var uploader = $('#xe-uploader-container-{$editor_sequence}').xeUploader(setting);
});
})(jQuery); })(jQuery);
</script> </script>
<style> <style>

2
modules/file/file.controller.php
View file

@ -25,6 +25,8 @@ class fileController extends file
*/ */
function procFileUpload() function procFileUpload()
{ {
Context::setRequestMethod('JSON');
$file_info = Context::get('Filedata'); $file_info = Context::get('Filedata');
// An error appears if not a normally uploaded file // An error appears if not a normally uploaded file