From 85f82888f23dbe3740a62ad3256b53d6af419f78 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Tue, 8 Jul 2014 14:02:42 +0800
Subject: [PATCH] Pman.Dialog.CoreEmail.bjs Pman.Dialog.CoreEmail.js

---
 Pman.Dialog.CoreEmail.bjs | 3 ++-
 Pman.Dialog.CoreEmail.js  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Pman.Dialog.CoreEmail.bjs b/Pman.Dialog.CoreEmail.bjs
index 2eed6a76..792572f0 100644
--- a/Pman.Dialog.CoreEmail.bjs
+++ b/Pman.Dialog.CoreEmail.bjs
@@ -267,11 +267,12 @@
                                                             "|xns": "Roo.form",
                                                             "items": [
                                                                 {
+                                                                    "clearUp": false,
                                                                     "height": 250,
                                                                     "name": "bodytext",
                                                                     "resizable": "s",
                                                                     "xtype": "HtmlEditor",
-                                                                    "|cwhite": "[ \n    'margin',\n    'padding',\n    'text-align',\n    'background',\n    'height',\n    'width',\n    'background-color',\n    'font-size',\n    'line-height',\n    'color',\n    'outline',\n    'text-decoration',\n    'position',\n    'clear',\n    'overflow',\n    'margin-top',\n    'border-bottom',\n    'top',\n    'list-style',\n    'margin-left',\n    'border',\n    'float' ,\n    'margin-right',\n    'padding-top',\n    'min-height',\n    'left',\n    'padding-left',\n    'font-weight',\n    'font-family',\n    'display',\n    'margin-bottom',\n    'padding-bottom',\n    'vertical-align',\n    'cursor',\n    'z-index',\n    'right',\n    'style',\n ]",
+                                                                    "|cwhite": "[ \n    'margin',\n    'padding',\n    'text-align',\n    'background',\n    'height',\n    'width',\n    'background-color',\n    'font-size',\n    'line-height',\n    'color',\n    'outline',\n    'text-decoration',\n    'position',\n    'clear',\n    'overflow',\n    'margin-top',\n    'border-bottom',\n    'top',\n    'list-style',\n    'margin-left',\n    'border',\n    'float' ,\n    'margin-right',\n    'padding-top',\n    'min-height',\n    'left',\n    'padding-left',\n    'font-weight',\n    'font-family',\n    'display',\n    'margin-bottom',\n    'padding-bottom',\n    'vertical-align',\n    'cursor',\n    'z-index',\n    'right',\n ]",
                                                                     "|xns": "Roo.form",
                                                                     "items": [
                                                                         {
diff --git a/Pman.Dialog.CoreEmail.js b/Pman.Dialog.CoreEmail.js
index 8f53492e..e72a40fa 100644
--- a/Pman.Dialog.CoreEmail.js
+++ b/Pman.Dialog.CoreEmail.js
@@ -462,6 +462,7 @@ Pman.Dialog.CoreEmail = {
                                                             {
                                                                 xtype: 'HtmlEditor',
                                                                 xns: Roo.form,
+                                                                clearUp : false,
                                                                 height : 250,
                                                                 name : 'bodytext',
                                                                 resizable : 's',
@@ -502,7 +503,6 @@ Pman.Dialog.CoreEmail = {
                                                                     'cursor',
                                                                     'z-index',
                                                                     'right',
-                                                                    'style',
                                                                  ],
                                                                 toolbars : [
                                                                     {
-- 
2.39.2