Skip to content

修复图片上传不能正确解析和缩放的bug #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Iamlars wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

修复图片上传不能正确解析和缩放的bug #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dialogs/image/image.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@
.edui-dialog-image .edui-image-item .edui-image-pic{position: absolute;left:-9999px;}
.edui-dialog-image .edui-image-item .edui-image-close{position:absolute;right:0;background: url('images/close.png');width:17px;height:17px;cursor:pointer;z-index:1}
.edui-dialog-image .edui-image-item.hover .edui-image-close{display: block;}

/*
* scale
* 需要显式设置.edui-scale的box-sizing，
* 否则当全局设置div为box-sizing:border-box时，会导致缩放功能失效
*/
.edui-scale{box-sizing: content-box;}
19 changes: 14 additions & 5 deletions dialogs/image/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,22 @@
arr = [],
$imgs = $(sel, $w);

$.each($imgs, function (index, node) {
$.each($imgs, function (index, node, src) {
$(node).removeAttr("width").removeAttr("height");

// if (node.width > editor.options.initialFrameWidth) {
// me.scale(node, editor.options.initialFrameWidth -
// parseInt($(editor.body).css("padding-left")) -
// parseInt($(editor.body).css("padding-right")));
// }

/*
* 如果使用js原生的node.src方式获取图片路径，本地上传的图片会默认加上locahost，从而导致
* 保存到服务器的图片路径为locahost://imgsrc.png,读取后无法显示。
*/
src = $(node).attr('src');
return arr.push({
_src: node.src,
src: node.src
_src: src,
src: src
});
});

Expand Down Expand Up @@ -185,6 +189,12 @@
uploadComplete: function(r){
var me = this;
try{
/*
* 在chrome和firefox浏览器下，会自动加入pre标签
* 需要删除该标签，才可以显示上传的图片
*
*/
r = r.replace(/<pre.*?>/, "").replace("</pre>", "");
var json = eval('('+r+')');
Base.callback(me.editor, me.dialog, json.url, json.state);
}catch (e){
Expand Down Expand Up @@ -442,4 +452,3 @@
Base.callback(editor, $w, url, state)
})
})();