rabin 7 months ago
parent
commit
4de6c36147
2 changed files with 10 additions and 6 deletions
  1. 3 3
      assets/lib/kindeditor/kindeditor-all-min.js
  2. 7 3
      assets/lib/manage/main.js

+ 3 - 3
assets/lib/kindeditor/kindeditor-all-min.js

@@ -7350,7 +7350,7 @@ KindEditor.plugin('flash', function(K) {
 					};
 
 					var cur = K('[name="url"]', div).val();
-					editorShowUpload(cur, self.fileManagerJson, 'flash库', clickFn, this);
+					editorShowUpload(cur, self.mediaManagerJson, 'flash库', clickFn, this);
 
 					/*
 					self.loadPlugin('filemanager', function() {
@@ -8231,7 +8231,7 @@ KindEditor.plugin('media', function(K) {
 					};
 
 					var cur = K('[name="url"]', div).val();
-					editorShowUpload(cur, self.fileManagerJson, '音频库', clickFn, this);
+					editorShowUpload(cur, self.mediaManagerJson, '音频库', clickFn, this);
 					/*
 					self.loadPlugin('filemanager', function() {
 						self.plugin.filemanagerDialog({
@@ -10329,7 +10329,7 @@ KindEditor.plugin('res', function(K) {
 			self.insertHtml(html);
 		};
 
-		editorShowUpload('', self.fileManagerJson, '视频库', clickFn, this);
+		editorShowUpload('', self.mediaManagerJson, '视频库', clickFn, this);
     });
 });
 

+ 7 - 3
assets/lib/manage/main.js

@@ -528,8 +528,11 @@ function loadEditorParam(e)
 		yun.domain = domain;
 		yun.path = path;
 	}
+	if (!key) {
+		key = 1;
+	}
 	if (!media) {
-		media = key;
+		media = 3;
 	}
 
 	var view = config.upload.replace('save', 'view');
@@ -547,7 +550,8 @@ function loadEditorParam(e)
 		uploadResJson : config.uploadRes + '.kindeditor?key=' + key + '&search=' + upload_search_value,
 		uploadMediaJson : config.upload + '.kindeditor?key=' + media + '&search=' + upload_search_value,
 		uploadYunJson : yun,
-		fileManagerJson : view + '.files?key=' + media + '&upload_search=' + upload_search,
+		fileManagerJson : view + '.files?key=' + key + '&upload_search=' + upload_search,
+		mediaManagerJson : view + '.files?key=' + media + '&upload_search=' + upload_search,
 
 		htmlTags : {
 			section : ['id', 'class', 'color', 'size', 'face', '.background-color'],
@@ -590,7 +594,7 @@ function loadEditorParam(e)
 		        'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
 		        'justifyfull', 'indent', 'outdent', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', 'source', '/',
 		        'formatblock', 'fontsize', 'fontheight', '|', 'forecolor', 'hilitecolor', 'bold',
-		        'italic', 'underline', 'lineheight', 'removeformat', 'insertorderedlist','|', 'image','table', 'hr', 'pagebreak','link', 'unlink'
+		        'italic', 'underline', 'lineheight', 'removeformat', 'insertorderedlist','|', 'image','media','table', 'hr', 'pagebreak','link', 'unlink'
 		]
 		/*
 		items : [