Merge pull request pandao#201 from luckylh/master

pandao · pandao · commit e7fc0049cfa0 · 2016-05-15T22:50:26.000+08:00
&#36328;&#22495;&#19978;&#20256;&#22270;&#29255;&#26102;&#65292;&#19981;&#30452;&#25509;&#36827;&#34892;&#21028;&#26029;&#26159;&#21542;&#19978;&#20256;&#22270;&#29255;&#25104;&#21151;
diff --git a/plugins/image-dialog/image-dialog.js b/plugins/image-dialog/image-dialog.js
@@ -134,14 +134,14 @@
 					if (fileName === "")
 					{
 						alert(imageLang.uploadFileEmpty);
-                        
+
                         return false;
 					}
-					
+
                     if (!isImage.test(fileName))
 					{
 						alert(imageLang.formatNotAllowed + settings.imageFormats.join(", "));
-                        
+
                         return false;
 					}
 
@@ -152,21 +152,24 @@
                         var uploadIframe = document.getElementById(iframeName);
 
                         uploadIframe.onload = function() {
-                            
+
                             loading(false);
 
                             var body = (uploadIframe.contentWindow ? uploadIframe.contentWindow : uploadIframe.contentDocument).document.body;
                             var json = (body.innerText) ? body.innerText : ( (body.textContent) ? body.textContent : null);
 
                             json = (typeof JSON.parse !== "undefined") ? JSON.parse(json) : eval("(" + json + ")");
 
-                            if (json.success === 1)
-                            {
-                                dialog.find("[data-url]").val(json.url);
-                            }
-                            else
+                            if(!settings.crossDomainUpload)
                             {
-                                alert(json.message);
+                              if (json.success === 1)
+                              {
+                                  dialog.find("[data-url]").val(json.url);
+                              }
+                              else
+                              {
+                                  alert(json.message);
+                              }
                             }
 
                             return false;
