|
|
@@ -4242,7 +4242,7 @@ _extend(KUploadButton, {
|
|
|
};
|
|
|
var hiddenElements = [];
|
|
|
for(var k in extraParams){
|
|
|
- hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
|
|
|
+ hiddenElements.push('<input type="hidden" class="ke-upload-file-'+k+'" name="' + k + '" value="' + extraParams[k] + '" />');
|
|
|
}
|
|
|
var html = [
|
|
|
'<div class="ke-inline-block ' + cls + '">',
|
|
|
@@ -4267,35 +4267,51 @@ _extend(KUploadButton, {
|
|
|
K('.ke-upload-area', div).width(width);
|
|
|
self.options = options;
|
|
|
},
|
|
|
- submit : function() {
|
|
|
+ submit : function(e) {
|
|
|
var self = this,
|
|
|
iframe = self.iframe;
|
|
|
- iframe.bind('load', function() {
|
|
|
- iframe.unbind();
|
|
|
- var tempForm = document.createElement('form');
|
|
|
- self.fileBox.before(tempForm);
|
|
|
- K(tempForm).append(self.fileBox);
|
|
|
- tempForm.reset();
|
|
|
- K(tempForm).remove(true);
|
|
|
- var doc = K.iframeDoc(iframe),
|
|
|
- pre = doc.getElementsByTagName('pre')[0],
|
|
|
- str = '', data;
|
|
|
- if (pre) {
|
|
|
- str = pre.innerHTML;
|
|
|
- } else {
|
|
|
- str = doc.body.innerHTML;
|
|
|
- }
|
|
|
- str = _unescape(str);
|
|
|
- iframe[0].src = 'javascript:false';
|
|
|
- try {
|
|
|
- data = K.json(str);
|
|
|
- } catch (e) {
|
|
|
- self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
|
|
|
- }
|
|
|
- if (data) {
|
|
|
- self.options.afterUpload.call(self, data);
|
|
|
- }
|
|
|
- });
|
|
|
+
|
|
|
+ e = false;
|
|
|
+ if (e) {
|
|
|
+ var file = e.files[0];
|
|
|
+ var filename = file.name;
|
|
|
+ var temp = filename.split('.');
|
|
|
+ //putExtra.params["x:name"] = temp[0];
|
|
|
+ var filename = hex_md5(file.name) + '.' + temp[temp.length-1];
|
|
|
+ var path = $('.' + 'ke-upload-file-key').val();
|
|
|
+ $('.' + 'ke-upload-file-key').val(path + filename);
|
|
|
+
|
|
|
+ //这里要修改 以后再改
|
|
|
+ } else {
|
|
|
+ iframe.bind('load', function() {
|
|
|
+ iframe.unbind();
|
|
|
+ var tempForm = document.createElement('form');
|
|
|
+ self.fileBox.before(tempForm);
|
|
|
+ K(tempForm).append(self.fileBox);
|
|
|
+ tempForm.reset();
|
|
|
+ K(tempForm).remove(true);
|
|
|
+ var doc = K.iframeDoc(iframe),
|
|
|
+ pre = doc.getElementsByTagName('pre')[0],
|
|
|
+ str = '', data;
|
|
|
+ if (pre) {
|
|
|
+ str = pre.innerHTML;
|
|
|
+ } else {
|
|
|
+ str = doc.body.innerHTML;
|
|
|
+ }
|
|
|
+ str = _unescape(str);
|
|
|
+ iframe[0].src = 'javascript:false';
|
|
|
+ try {
|
|
|
+ data = K.json(str);
|
|
|
+ } catch (e) {
|
|
|
+ self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
|
|
|
+ }
|
|
|
+ if (data) {
|
|
|
+ self.options.afterUpload.call(self, data);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ self.form[0].submit();
|
|
|
+ }
|
|
|
+
|
|
|
self.form[0].submit();
|
|
|
return self;
|
|
|
},
|
|
|
@@ -6016,7 +6032,8 @@ function dopasteImg() {
|
|
|
//formData.append('imgFile', b);
|
|
|
formData.append('dir', isImg ? 'image' : 'file');
|
|
|
if (self.uploadYunJson && self.uploadYunJson.domain) {
|
|
|
- xhr.open('POST', self.uploadJson.domain);
|
|
|
+ formData.append('token', self.uploadYunJson.token);
|
|
|
+ xhr.open('POST', self.uploadYunJson.domain);
|
|
|
} else {
|
|
|
xhr.open('POST', self.uploadJson);
|
|
|
}
|
|
|
@@ -6240,7 +6257,7 @@ KindEditor.lang({
|
|
|
image : '图片',
|
|
|
multiimage : '批量图片上传',
|
|
|
flash : 'Flash',
|
|
|
- media : '音频',
|
|
|
+ media : '音视频',
|
|
|
table : '表格',
|
|
|
tablecell : '单元格',
|
|
|
hr : '插入横线',
|
|
|
@@ -6268,8 +6285,8 @@ KindEditor.lang({
|
|
|
deleteImage : '删除图片',
|
|
|
editFlash : 'Flash属性',
|
|
|
deleteFlash : '删除Flash',
|
|
|
- editMedia : '音频属性',
|
|
|
- deleteMedia : '删除音频',
|
|
|
+ editMedia : '音视频属性',
|
|
|
+ deleteMedia : '删除音视频',
|
|
|
editLink : '超级链接属性',
|
|
|
deleteLink : '取消超级链接',
|
|
|
editAnchor : '锚点属性',
|
|
|
@@ -7918,6 +7935,13 @@ KindEditor.plugin('media', function(K) {
|
|
|
extraParams = K.undef(self.extraFileUploadParams, {}),
|
|
|
filePostName = K.undef(self.filePostName, 'imgFile'),
|
|
|
uploadJson = K.undef(self.uploadMediaJson, self.basePath + 'php/upload_json.php');
|
|
|
+
|
|
|
+ if (self.uploadYunJson && self.uploadYunJson.domain) {
|
|
|
+ uploadJson = self.uploadYunJson.domain;
|
|
|
+ extraParams.token = self.uploadYunJson.token;
|
|
|
+ extraParams.key = self.uploadYunJson.path;
|
|
|
+ }
|
|
|
+
|
|
|
self.plugin.media = {
|
|
|
edit : function() {
|
|
|
var html = [
|
|
|
@@ -7997,6 +8021,7 @@ KindEditor.plugin('media', function(K) {
|
|
|
extraParams : extraParams,
|
|
|
url : K.addParam(uploadJson, 'dir=media'),
|
|
|
afterUpload : function(data) {
|
|
|
+ console.info(data);
|
|
|
dialog.hideLoading();
|
|
|
if (data.error === 0) {
|
|
|
var url = data.url;
|
|
|
@@ -8019,7 +8044,7 @@ KindEditor.plugin('media', function(K) {
|
|
|
});
|
|
|
uploadbutton.fileBox.change(function(e) {
|
|
|
dialog.showLoading(self.lang('uploadLoading'));
|
|
|
- uploadbutton.submit();
|
|
|
+ uploadbutton.submit(this);
|
|
|
});
|
|
|
} else {
|
|
|
K('.ke-upload-button', div).hide();
|
|
|
@@ -8035,7 +8060,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({
|
|
|
@@ -10118,7 +10143,7 @@ function autoImg(self) {
|
|
|
var that = $(this);
|
|
|
var host = gethost(self.uploadJson);
|
|
|
if (self.uploadYunJson && self.uploadYunJson.host) {
|
|
|
- var yhost = gethost(self.uploadYunJson.host);
|
|
|
+ var host = gethost(self.uploadYunJson.host);
|
|
|
}
|
|
|
|
|
|
if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) {
|
dever