dever 6 years ago
parent
commit
50b689cf71
2 changed files with 4 additions and 2 deletions
  1. 2 1
      assets/lib/kindeditor/kindeditor-all-min.js
  2. 2 1
      assets/lib/manage/main.js

+ 2 - 1
assets/lib/kindeditor/kindeditor-all-min.js

@@ -7909,7 +7909,7 @@ KindEditor.plugin('media', function(K) {
 		formatUploadUrl = K.undef(self.formatUploadUrl, true),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
 		filePostName = K.undef(self.filePostName, 'imgFile'),
-		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+		uploadJson = K.undef(self.uploadMediaJson, self.basePath + 'php/upload_json.php');
 	self.plugin.media = {
 		edit : function() {
 			var html = [
@@ -8304,6 +8304,7 @@ KindEditor.plugin('multiimage', function(K) {
 			uploadDesc : uploadDesc,
 			startButtonValue : lang.startUpload,
 			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			uploadMediaUrl : K.addParam(uploadMediaUrl, 'dir=media'),
 			flashUrl : imgPath + 'swfupload.swf',
 			filePostName : filePostName,
 			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',

+ 2 - 1
assets/lib/manage/main.js

@@ -328,11 +328,12 @@ function loadEditorParam(e)
 		allowImageRemote : true, //上传图片框网络图片的功能,false为隐藏,默认为true
 		allowFileManager : true, //浏览图片空间
 		allowMediaUpload : true,
-		filterMode : true, //HTML特殊代码过滤
+		filterMode : false, //HTML特殊代码过滤
 		themeType : 'default',
 		filePostName : 'file',
 		dialogOffset : 0, //对话框距离页面顶部的位置,默认为0居中,
 		uploadJson : config.upload + '.kindeditor?key=' + key,
+		uploadMediaJson : config.upload + '.kindeditor?key=' + media,
 		fileManagerJson : view + '.files?key=' + media,
 
 		items : [