From fc72d24aafd7abeb75c730f4c916218471d564b1 Mon Sep 17 00:00:00 2001
From: "858683682@qq.com" <858683682@qq.com>
Date: Wed, 9 Dec 2015 14:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=92=8C=E7=BC=A9=E6=94=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dialogs/image/image.css |  7 +++++++
 dialogs/image/image.js  | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/dialogs/image/image.css b/dialogs/image/image.css
index 55483914..413b32ea 100644
--- a/dialogs/image/image.css
+++ b/dialogs/image/image.css
@@ -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;}
diff --git a/dialogs/image/image.js b/dialogs/image/image.js
index 9e9e7a3b..bab92e0a 100755
--- a/dialogs/image/image.js
+++ b/dialogs/image/image.js
@@ -25,7 +25,7 @@
                 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) {
@@ -33,10 +33,14 @@
 //                        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
                 });
             });
 
@@ -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){
@@ -442,4 +452,3 @@
         Base.callback(editor, $w, url, state)
     })
 })();
-