DataObjects/Core_person_signup.php

[Pman.Core] / Pman.Dialog.CoreEmail.js

diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 8f53492..92b392f 100644 (file)
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -374,8 +374,17 @@ Pman.Dialog.CoreEmail = {
                                                    //    _this.form.doAction("submit");
                                                       return;
                                                 }
-                                                var i = nodes.pop();        
-                                                var n = i.getAttribute('src').match(/^http(.*)/);
+                                                var i = nodes.pop(); 
+                                                
+                                                var n = i.getAttribute('src').match(/(baseURL|server_baseurl)/);
+                                                
+                                                if(n){
+                                                    mkimg();
+                                                    return;
+                                                }
+                                                
+                                                n = i.getAttribute('src').match(/^http(.*)/)
+                                               
                                                 if(!n ){
                                                     mkimg();
                                                     return;
@@ -462,6 +471,7 @@ Pman.Dialog.CoreEmail = {
                                                             {
                                                                 xtype: 'HtmlEditor',
                                                                 xns: Roo.form,
+                                                                clearUp : false,
                                                                 height : 250,
                                                                 name : 'bodytext',
                                                                 resizable : 's',
@@ -502,7 +512,6 @@ Pman.Dialog.CoreEmail = {
                                                                     'cursor',
                                                                     'z-index',
                                                                     'right',
-                                                                    'style',
                                                                  ],
                                                                 toolbars : [
                                                                     {
@@ -1125,6 +1134,7 @@ Pman.Dialog.CoreEmail = {
                     listeners : {
                         click : function (_self, e)
                         {
+                        
                             // do some checks?
                             _this.form.preValidate(function(res) {
                                 if (!res) {