jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'yuanke' into develop

This commit is contained in:
huang 2016-05-13 20:02:45 +08:00
parent 37b93a4595 0cc9a9e4c5
commit 0fdff7a183
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/assets/kindeditor/pasteimg.js
View File

@ -416,9 +416,11 @@ function uploadpic(piclist,myself) {
that.attr("src", str[tIndex]);
that.attr("data-ke-src", str[tIndex]);
//复制过来带的链接class等都要去掉 和视频图片有关系
that.removeAttr("class");
that.parent().removeAttr("class");
that.parent().removeAttr("href");
that.parents().removeAttr("href"); //删除所有父节点的href
// that.parent().removeAttr("href");
that.parent().removeAttr("data-ke-src");
tIndex = tIndex + 1;
}

1
public/javascripts/application.js
View File

@ -1045,6 +1045,7 @@ function showNormalImage(id) {
$(image).attr('src',_src);
return;
}
//无格式的图片不让点击显示大图，显示的话会有问题
var tmpsrc = image.attr('src');
if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) {
var element = $("<a></a>").attr("href", image.attr('src'));