xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

relative image url/fix conflict when upload attachment again

Browse Source
This commit is contained in:
lealife
2016-12-24 15:16:23 +08:00
parent f49624d3eb
commit a8dd578624
24 changed files with 130 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/tinymce/plugins/leaui_image/plugin.js
View File

@ -110,13 +110,8 @@ tinymce.PluginManager.add('leaui_image', function(editor, url) {
var data = datas[i];
var src = data.src;
// the network image
var trueSrc;
if(src.indexOf("http://") != -1 || src.indexOf("https://") != -1) {
trueSrc = src;
} else {
trueSrc = url + "/" + src;
}
data.src = trueSrc;
var trueSrc = src;
data.src = src;
var renderImage = function(data) {
// 这里, 如果图片宽度过大, 这里设置成500px
@ -125,7 +120,7 @@ tinymce.PluginManager.add('leaui_image', function(editor, url) {
var imgElm;
// 先显示loading...
d.id = '__mcenew' + i;
d.src = "http://leanote.com/images/loading-24.gif";
d.src = "/images/loading-24.gif";
imgElm = dom.createHTML('img', d);
editor.insertContent(imgElm);
imgElm = dom.get(d.id);
@ -164,8 +159,7 @@ tinymce.PluginManager.add('leaui_image', function(editor, url) {
(function(data) {
ajaxPost("/file/copyImage", {userId: UserInfo.UserId, fileId: fileId, toUserId: curNote.UserId}, function(re) {
if(reIsOk(re) && re.Id) {
var urlPrefix = UrlPrefix; // window.location.protocol + "//" + window.location.host;
data.src = urlPrefix + "/api/file/getImage?fileId=" + re.Id;
data.src = "/api/file/getImage?fileId=" + re.Id;
}
renderImage(data);
});