From: Edward <edward@roojs.com>
Date: Tue, 8 Jul 2014 10:23:30 +0000 (+0800)
Subject: Pman.Dialog.CoreEmail.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f0af482d912db40d81701a9c2545a141da1f4972

Pman.Dialog.CoreEmail.bjs
Pman.Dialog.CoreEmail.js
---

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index f249a08b..11b6d85f 100644
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -206,7 +206,7 @@
                                             "method": "POST",
                                             "style": "margin:10px",
                                             "xtype": "Form",
-                                            "|preValidate": "function(done_callback) {\n    \n    Roo.MessageBox.progress(\"Uploading Images\", \"Uploading\");\n    var html = _this.form.findField('bodytext').getValue();\n    \n    var s = Roo.get(_this.form.findField('bodytext').editorcore.doc.documentElement);\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    var nodes = [];\n    s.select('img[src]').each(function(i) {\n        nodes.push(i.dom);\n    });\n    var total = nodes.length;\n    var mkimg = function() {\n    \n        if (!nodes.length) {\n              Roo.MessageBox.hide();\n              _this.form.findField('bodytext').syncValue();\n              done_callback(true);\n           //    _this.form.doAction(\"submit\");\n              return;\n        }\n        var i = nodes.pop();        \n        var n = i.getAttribute('src').match(/^http(.*)/) && i.getAttribute('src').match(/baseURL/);\n        if(!n ){\n            mkimg();\n            return;\n        }\n        \n        new Pman.Request({\n            url : baseURL + '/Roo/Images.php',\n            method : 'POST',\n            params : {\n                onid : _this.form.findField('id').getValue(),\n                ontable : ontable ,\n                _remote_upload : i.src\n            },\n            success : function(res){\n                if(res.success == true){      \n                    i.setAttribute('src', res.data);\n                    Roo.MessageBox.updateProgress( (total - nodes.length) / total , \"Done \" + (total - nodes.length) + '/' + total);\n                }\n                mkimg();\n            }\n        });\n       \n    }\n    mkimg();\n}\n",
+                                            "|preValidate": "function(done_callback) {\n    \n    Roo.MessageBox.progress(\"Uploading Images\", \"Uploading\");\n    var html = _this.form.findField('bodytext').getValue();\n    \n    var s = Roo.get(_this.form.findField('bodytext').editorcore.doc.documentElement);\n    \n    var ontable = (_this.data.module) ? _this.data.module : 'crm_mailing_list_message';\n    \n    var nodes = [];\n    s.select('img[src]').each(function(i) {\n        nodes.push(i.dom);\n    });\n    var total = nodes.length;\n    var mkimg = function() {\n    \n        if (!nodes.length) {\n              Roo.MessageBox.hide();\n              _this.form.findField('bodytext').syncValue();\n              done_callback(true);\n           //    _this.form.doAction(\"submit\");\n              return;\n        }\n        var i = nodes.pop(); \n        \n        var skip = i.getAttribute('src').match(/baseURL/);\n        \n        if(skip){\n            return;\n        }\n               \n        var n = i.getAttribute('src').match(/^http(.*)/)\n        if(!n ){\n            mkimg();\n            return;\n        }\n        \n        new Pman.Request({\n            url : baseURL + '/Roo/Images.php',\n            method : 'POST',\n            params : {\n                onid : _this.form.findField('id').getValue(),\n                ontable : ontable ,\n                _remote_upload : i.src\n            },\n            success : function(res){\n                if(res.success == true){      \n                    i.setAttribute('src', res.data);\n                    Roo.MessageBox.updateProgress( (total - nodes.length) / total , \"Done \" + (total - nodes.length) + '/' + total);\n                }\n                mkimg();\n            }\n        });\n       \n    }\n    mkimg();\n}\n",
                                             "|url": "baseURL + '/Roo/crm_mailing_list_message.php'",
                                             "|xns": "Roo.form",
                                             "items": [
diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 999fc152..4a228355 100644
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -374,8 +374,15 @@ Pman.Dialog.CoreEmail = {
                                                    //    _this.form.doAction("submit");
                                                       return;
                                                 }
-                                                var i = nodes.pop();        
-                                                var n = i.getAttribute('src').match(/^http(.*)/) && i.getAttribute('src').match(/baseURL/);
+                                                var i = nodes.pop(); 
+                                                
+                                                var skip = i.getAttribute('src').match(/baseURL/);
+                                                
+                                                if(skip){
+                                                    return;
+                                                }
+                                                       
+                                                var n = i.getAttribute('src').match(/^http(.*)/)
                                                 if(!n ){
                                                     mkimg();
                                                     return;