dever 6 vuotta sitten
vanhempi
commit
3b6399af33

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

@@ -302,7 +302,7 @@ K.options = {
 			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
 		],
 		a : ['id', 'class', 'href', 'target', 'name'],
-		//embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess', 'wmode'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess', 'wmode'],
 		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',

+ 1 - 1
assets/lib/layui/upload.js

@@ -106,7 +106,7 @@ function showUploadFilesSet(e, name, url, id)
 		var value = showUploadE.attr('editor_id');
 		var key = showUploadE.attr('key');
 		//KindEditor.insertHtml('#' + value, '<div class="dever-video"><embed src="'+url+'" type="video/x-ms-asf-plugin" width="450" height="300" autostart="false" loop="true" data-id="'+id+'" data-key="'+key+'"/><div style="width:450px;height:20px;">'+name+':'+id+'(请勿修改)</div></div>');
-		KindEditor.insertHtml('#' + value, '<div class="dever-video"><img src="'+url+'" style="width:450px;height:300px;" data-id="'+id+'" data-key="'+key+'"/></div><div class="dever-drop">'+name+'(请勿修改)</div>');
+		KindEditor.insertHtml('#' + value, '<img src="'+url+'" style="width:450px;height:300px;" data-id="'+id+'" data-key="'+key+'"/>');
 		if (showUploadIndex) {
 			layer.close(showUploadIndex);
 			showUploadIndex = false;

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

@@ -339,6 +339,7 @@ function loadEditorParam(e)
 	if (!media) {
 		media = key;
 	}
+
 	var view = config.upload.replace('save', 'view');
 	var param = {
 		height : "400px",
@@ -362,7 +363,7 @@ function loadEditorParam(e)
 				'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
 			],
 			div : [
-				'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+				'id', 'class', 'data-id', 'data-key','.dever-video', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
 				'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
 				'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
 			],
@@ -378,7 +379,8 @@ function loadEditorParam(e)
 				'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
 			],
 			a : ['id', 'class', 'href', 'target', 'name'],
-			img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+			embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess', 'wmode'],
+			img : ['id', 'class', 'data-id', 'data-key', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 			'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 				'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
 				'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'