|
@@ -25,7 +25,7 @@ var showUploadIndex = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-function showUpload(i,e,key,url,assets)
|
|
|
|
|
|
+function showUpload(i,e,key,url,assets,type)
|
|
{
|
|
{
|
|
layui.use(['upload','layer','element'], function() {
|
|
layui.use(['upload','layer','element'], function() {
|
|
var html = '';
|
|
var html = '';
|
|
@@ -42,7 +42,10 @@ function showUpload(i,e,key,url,assets)
|
|
{
|
|
{
|
|
url = url.replace('save', 'view');
|
|
url = url.replace('save', 'view');
|
|
showUploadE = e;
|
|
showUploadE = e;
|
|
- showUploadType = 1;
|
|
|
|
|
|
+ if (!type) {
|
|
|
|
+ type = 1;
|
|
|
|
+ }
|
|
|
|
+ showUploadType = type;
|
|
showUploadUrl = url;
|
|
showUploadUrl = url;
|
|
var cur = $('#' + showUploadE.attr('v')).val();
|
|
var cur = $('#' + showUploadE.attr('v')).val();
|
|
$.getJSON(url, {json:1,key:key,cur:cur}, function(t)
|
|
$.getJSON(url, {json:1,key:key,cur:cur}, function(t)
|
|
@@ -99,6 +102,15 @@ function showUploadFilesSet(e, name, url, id)
|
|
} else {
|
|
} else {
|
|
layer.closeAll();
|
|
layer.closeAll();
|
|
}
|
|
}
|
|
|
|
+ } else if (showUploadType == 3) {
|
|
|
|
+ var value = showUploadE.attr('editor_id');
|
|
|
|
+ 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+'"/><div style="width:450px;height:20px;border:1px solid #bababa;">'+name+':'+id+'(无法修改)</div></div>');
|
|
|
|
+ if (showUploadIndex) {
|
|
|
|
+ layer.close(showUploadIndex);
|
|
|
|
+ showUploadIndex = false;
|
|
|
|
+ } else {
|
|
|
|
+ layer.closeAll();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|