|
@@ -31,7 +31,7 @@ function showUpload(i,e,key,url,assets,type)
|
|
|
var html = '';
|
|
|
var layer = layui.layer;
|
|
|
var config = {
|
|
|
- type: 0,
|
|
|
+ type: 1,
|
|
|
title: e.attr('value'),
|
|
|
shade: 0.1,
|
|
|
shadeClose : true,
|
|
@@ -54,7 +54,10 @@ function showUpload(i,e,key,url,assets,type)
|
|
|
}
|
|
|
$.getJSON(url, {json:1,key:key,cur:cur,value:value}, function(t)
|
|
|
{
|
|
|
- layer.closeAll();
|
|
|
+ if (showUploadIndex) {
|
|
|
+ layer.close(showUploadIndex);
|
|
|
+ }
|
|
|
+ //layer.closeAll();
|
|
|
config.content = t.data;
|
|
|
showUploadIndex = layer.open(config);
|
|
|
})
|
|
@@ -71,7 +74,7 @@ function editorShowUpload(cur, url, title, func, self)
|
|
|
var html = '';
|
|
|
var layer = layui.layer;
|
|
|
var config = {
|
|
|
- type: 0,
|
|
|
+ type: 1,
|
|
|
title: title,
|
|
|
shade: 0.1,
|
|
|
shadeClose : true,
|
|
@@ -101,23 +104,18 @@ function showUploadFilesSet(e, name, url, id)
|
|
|
loadUploadSet(showUploadE, value, {name:name,url:url});
|
|
|
} else if (showUploadType == 2) {
|
|
|
showUploadCall.call(showUploadThis, url, name, id);
|
|
|
- if (showUploadIndex) {
|
|
|
- layer.close(showUploadIndex);
|
|
|
- showUploadIndex = false;
|
|
|
- } else {
|
|
|
- layer.closeAll();
|
|
|
- }
|
|
|
} else if (showUploadType == 3) {
|
|
|
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, '<img src="'+url+'" style="width:450px;height:300px;" data-id="'+id+'" data-key="'+key+'"/>');
|
|
|
- if (showUploadIndex) {
|
|
|
- layer.close(showUploadIndex);
|
|
|
- showUploadIndex = false;
|
|
|
- } else {
|
|
|
- layer.closeAll();
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (showUploadIndex) {
|
|
|
+ layer.close(showUploadIndex);
|
|
|
+ showUploadIndex = false;
|
|
|
+ } else {
|
|
|
+ layer.closeAll();
|
|
|
}
|
|
|
}
|
|
|
|