From 022cba2228dbea633480402399c6015a1c83276c Mon Sep 17 00:00:00 2001 From: Edward Date: Wed, 9 Jul 2014 20:01:32 +0800 Subject: [PATCH] Pman.Dialog.CoreEmail.bjs Pman.Dialog.CoreEmail.js --- Pman.Dialog.CoreEmail.bjs | 4 ++-- Pman.Dialog.CoreEmail.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs index 1470d694..20eb1aaf 100644 --- a/Pman.Dialog.CoreEmail.bjs +++ b/Pman.Dialog.CoreEmail.bjs @@ -1,5 +1,5 @@ { - "id": "roo-file-208", + "id": "roo-file-210", "name": "Pman.Dialog.CoreEmail", "parent": "", "title": "", @@ -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 \n var n = i.getAttribute('src').match(/baseURL/);\n \n if(n){\n mkimg();\n return;\n }\n \n n = i.getAttribute('src').match(/^http(.*)/)\n \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 n = i.getAttribute('src').match(/(baseURL|server_baseurl)/);\n \n if(n){\n mkimg();\n return;\n }\n \n n = i.getAttribute('src').match(/^http(.*)/)\n \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 052ada92..92b392f5 100644 --- a/Pman.Dialog.CoreEmail.js +++ b/Pman.Dialog.CoreEmail.js @@ -376,7 +376,7 @@ Pman.Dialog.CoreEmail = { } var i = nodes.pop(); - var n = i.getAttribute('src').match(/baseURL/); + var n = i.getAttribute('src').match(/(baseURL|server_baseurl)/); if(n){ mkimg(); -- 2.39.2