fix

common/js/plugins/jquery.fileupload/js/main.js

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

modules/editor/skins/ckeditor/editor.html

@@ -25,14 +25,13 @@
 <div id="ckeditor_instance_{$editor_sequence}"></div>
 
 <!--%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">
 		<img />
 	</div>
 
 	<div style="display:inline-block; vertical-align:top;">
 		<div class="xe-uploader-filelist" style="">
-
 			<select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="" style="width: 300px;">
 			</select>
 		</div>
@@ -54,19 +53,6 @@
 			<div class="file_attach_info" style="display:inline-block;" id="uploader_status_{$editor_sequence}">{$upload_status}</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>
 
 <script>
@@ -75,6 +61,7 @@
 	var editor_primary_key_name = '{$editor_primary_key_name}';
 	var editor_content_key_name = '{$editor_content_key_name}';
 
+	// editor
 	$(function(){
 		var pl = xe.getApp('xeEditorApp')[0].getPlugin('ckeditor')[0];
 		var editor_id = 'ckeditor_instance_{$editor_sequence}';
@@ -130,6 +117,15 @@
 
 		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);
 </script>
 <style>

modules/file/file.controller.php

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