Ticket #7590: 7590_2.patch

CKEditor.NET/CKEditorConfig.cs

@@ -1094 +1094 @@
                 /// List of regular expressions to be executed over the input HTML, indicating HTML source code that matched must not present in WYSIWYG mode for editing.
                 /// Default Value: []
                 /// </summary>
-                [CKSerializable(IsObject = true)]
-                public object[] protectedSource { get; set; }
+                public string [] protectedSource { get; set; }
 
                 /// <summary>
                 /// The dialog contents to removed. It's a string composed by dialog name and tab name with a colon between them. 
@@ -1777 +1776 @@
                         GlobalConfigObj.pasteFromWordRemoveStyles = false;
                         //      todo
                         //this.plugins = string.Empty;
-                        GlobalConfigObj.protectedSource = new object[0];
+                        GlobalConfigObj.protectedSource = new string[0];
                         GlobalConfigObj.removeDialogTabs = string.Empty;
                         GlobalConfigObj.removeFormatAttributes = "class,style,lang,width,height,align,hspace,valign";
                         GlobalConfigObj.removeFormatTags = "b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var";

CKEditor.NET/CKEditorControl.cs

@@ -91 +91 @@
 
                 [Category("CKEditor Basic Settings")]
                 [Description("The height of editing area( content ), in relative or absolute, e.g. 30px, 5em. Note: Percentage unit is not supported yet.e.g. 30%.")]
-                [DefaultValue("200")]
+                [DefaultValue(typeof(System.Web.UI.WebControls.Unit), "200px")]
                 public override Unit Height
                 {
                         get
@@ -120 +120 @@
 
                 [Category("CKEditor Basic Settings")]
                 [Description("The editor width in CSS size format or pixel integer.")]
-                [DefaultValue("100%")]
+                [DefaultValue(typeof(System.Web.UI.WebControls.Unit), "100%")]
                 public override Unit Width
                 {
                         get
@@ -480 +480 @@
                 [PersistenceMode(PersistenceMode.Attribute)]
                 [Category("CKEditor Other Settings")]
                 [Description("List of classes to use for indenting the contents. If it's null, no classes will be used and instead the #indentUnit and #indentOffset properties will be used.")]
-                [DefaultValue("")]
+                [DefaultValue(typeof(Array), null)]
                 public string[] IndentClasses { get { return config.indentClasses; } set { config.indentClasses = value; } }
 
                 [Category("CKEditor Other Settings")]
@@ -527 +527 @@
                 [PersistenceMode(PersistenceMode.Attribute)]
                 [Category("CKEditor Other Settings")]
                 [Description("List of regular expressions to be executed over the input HTML, indicating HTML source code that matched must not present in WYSIWYG mode for editing.")]
-                [DefaultValue("")]
-                public string[] ProtectedSource
-                {
-                        get
-                        {
-                                string[] retVal = new string[config.protectedSource.Length];
-                                try { retVal = (string[])config.protectedSource; }
-                                catch { }
-                                return retVal;
-                        }
-                        set { config.protectedSource = value; }
-                }
+                [DefaultValue(typeof(Array), null)]
+                public string[] ProtectedSource { get { return config.protectedSource; } set { config.protectedSource = value; } }
 
                 [Category("CKEditor Other Settings")]
                 [Description(@"The dialog contents to removed. It's a string composed by dialog name and tab name with a colon between them.