edit

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

@@ -6232,7 +6232,7 @@ KindEditor.lang({
 	image : '图片',
 	multiimage : '批量图片上传',
 	flash : 'Flash',
-	media : '视音频',
+	media : '音频',
 	table : '表格',
 	tablecell : '单元格',
 	hr : '插入横线',
@@ -6260,8 +6260,8 @@ KindEditor.lang({
 	deleteImage : '删除图片',
 	editFlash : 'Flash属性',
 	deleteFlash : '删除Flash',
-	editMedia : '视音频属性',
-	deleteMedia : '删除视音频',
+	editMedia : '音频属性',
+	deleteMedia : '删除音频',
 	editLink : '超级链接属性',
 	deleteLink : '取消超级链接',
 	editAnchor : '锚点属性',
@@ -7277,7 +7277,7 @@ KindEditor.plugin('flash', function(K) {
 			if (allowFileManager) {
 				viewServerBtn.click(function(e) {
 
-					var clickFn = function(url, title) {
+					var clickFn = function(url, title, id) {
 						K('[name="url"]', div).val(url);
 						if (self.afterSelectFile) {
 							self.afterSelectFile.call(self, url);
@@ -7486,7 +7486,7 @@ KindEditor.plugin('image', function(K) {
 				title : lang.localImage,
 				panel : K('.tab2', div)
 			});
-			tabs.select(tabIndex);
+			tabs.select(1);
 		} else if (showRemote) {
 			K('.tab1', div).show();
 		} else if (showLocal) {
@@ -7531,7 +7531,7 @@ KindEditor.plugin('image', function(K) {
 			viewServerBtn.click(function(e) {
 
 				//clickFn.call(this, fileUrl, data.file);
-				var clickFn = function(url, title) {
+				var clickFn = function(url, title, id) {
 					K('[name="url"]', div).val(url);
 					if (self.afterSelectFile) {
 						self.afterSelectFile.call(self, url);
@@ -7749,7 +7749,7 @@ KindEditor.plugin('insertfile', function(K) {
 		if (allowFileManager) {
 			viewServerBtn.click(function(e) {
 
-				var clickFn = function(url, title) {
+				var clickFn = function(url, title, id) {
 					K('[name="url"]', div).val(url);
 					if (self.afterSelectFile) {
 						self.afterSelectFile.call(self, url);
@@ -7924,11 +7924,11 @@ KindEditor.plugin('media', function(K) {
 				'</div>',
 				'<div class="ke-dialog-row">',
 				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
-				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="450" maxlength="4" />',
 				'</div>',
 				'<div class="ke-dialog-row">',
 				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
-				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="100" maxlength="4" />',
 				'</div>',
 				'<div class="ke-dialog-row">',
 				'<label for="keAutostart">' + lang.autostart + '</label>',
@@ -8019,7 +8019,7 @@ KindEditor.plugin('media', function(K) {
 			if (allowFileManager) {
 				viewServerBtn.click(function(e) {
 
-					var clickFn = function(url, title) {
+					var clickFn = function(url, title, id) {
 						K('[name="url"]', div).val(url);
 						if (self.afterSelectFile) {
 							self.afterSelectFile.call(self, url);
@@ -8027,7 +8027,7 @@ KindEditor.plugin('media', function(K) {
 					};
 
 					var cur = K('[name="url"]', div).val();
-					editorShowUpload(cur, self.fileManagerJson, '音视频库', clickFn, this);
+					editorShowUpload(cur, self.fileManagerJson, '音频库', clickFn, this);
 					/*
 					self.loadPlugin('filemanager', function() {
 						self.plugin.filemanagerDialog({
@@ -10075,6 +10075,22 @@ KindEditor.plugin('fixtoolbar', function (K) {
     }
 });
 
+//自定义资源库
+KindEditor.plugin('res', function(K) {
+    var self = this;
+    // 点击图标时执行
+    self.clickToolbar('res', function() {
+		var clickFn = function(url, title, id) {
+			var html = '<embed src="{url}" type="video/x-ms-asf-plugin" width="550" height="400" autostart="false" loop="true" id="{id}"/>';
+			html = html.replace('{url}', url);
+			html = html.replace('{id}', id);
+			self.insertHtml(html);
+		};
+
+		editorShowUpload('', self.fileManagerJson, '视频库', clickFn, this);
+    });
+});
+
 function autoImg(self) {
 	var index = self.index;
     var haspicContainer = document.getElementById("has_pic_" + index);

assets/lib/layui/upload.js

@@ -78,7 +78,7 @@ function editorShowUpload(cur, url, title, func, self)
 	});
 }
 
-function showUploadFilesSet(e, name, url)
+function showUploadFilesSet(e, name, url, id)
 {
 	$('.layui-anim-yes').addClass('layui-anim-no');
 	$('.layui-anim-yes').removeClass('layui-anim-yes');
@@ -90,7 +90,7 @@ function showUploadFilesSet(e, name, url)
 		var value = showUploadE.attr('v');
 		loadUploadSet(showUploadE, value, {name:name,url:url});
 	} else if (showUploadType == 2) {
-		showUploadCall.call(showUploadThis, url, name);
+		showUploadCall.call(showUploadThis, url, name, id);
 		layer.closeAll();
 	}
 }

assets/lib/manage/main.js

@@ -295,6 +295,19 @@ function initEditor(e)
 			}
 		}
 	}
+
+	if ($('.editor_tool').length) {
+		$('.editor_tool').each(function()
+		{
+			$(this).click(function()
+			{
+				var tool = $(this).attr('tool');
+				var id = $(this).attr('editor_id');
+
+				editors[id].clickToolbar(tool);
+			})
+		});
+	}
 }
 
 function loadEditorParam(e)
@@ -310,7 +323,7 @@ function loadEditorParam(e)
 	}
 	var view = config.upload.replace('save', 'view');
 	var param = {
-		height : "500px",
+		height : "400px",
 		allowImageUpload: true, //上传图片框本地上传的功能，false为隐藏，默认为true
 		allowImageRemote : true, //上传图片框网络图片的功能，false为隐藏，默认为true
 		allowFileManager : true, //浏览图片空间
@@ -321,8 +334,6 @@ function loadEditorParam(e)
 		dialogOffset : 0, //对话框距离页面顶部的位置，默认为0居中，
 		uploadJson : config.upload + '.kindeditor?key=' + key,
 		fileManagerJson : view + '.files?key=' + media,
-		uploadLimit : 20,
-		sizeLimit : '50m',
 
 		items : [
 		        'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
@@ -330,9 +341,10 @@ function loadEditorParam(e)
 		        'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
 		        'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
 		        'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		        'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage', 'media' ,'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		        'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage' ,'media','table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
 		        'anchor', 'link', 'unlink'
 		]
+		//media
 		/*
 		items : [
 		        'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',