Ticket #7590: 7590_2.patch

File 7590_2.patch, 3.4 KB (added by kaga, 9 years ago)
  • CKEditor.NET/CKEditorConfig.cs

     
    10941094                /// 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.
    10951095                /// Default Value: []
    10961096                /// </summary>
    1097                 [CKSerializable(IsObject = true)]
    1098                 public object[] protectedSource { get; set; }
     1097                public string [] protectedSource { get; set; }
    10991098
    11001099                /// <summary>
    11011100                /// The dialog contents to removed. It's a string composed by dialog name and tab name with a colon between them.
     
    17771776                        GlobalConfigObj.pasteFromWordRemoveStyles = false;
    17781777                        //      todo
    17791778                        //this.plugins = string.Empty;
    1780                         GlobalConfigObj.protectedSource = new object[0];
     1779                        GlobalConfigObj.protectedSource = new string[0];
    17811780                        GlobalConfigObj.removeDialogTabs = string.Empty;
    17821781                        GlobalConfigObj.removeFormatAttributes = "class,style,lang,width,height,align,hspace,valign";
    17831782                        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

     
    9191
    9292                [Category("CKEditor Basic Settings")]
    9393                [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%.")]
    94                 [DefaultValue("200")]
     94                [DefaultValue(typeof(System.Web.UI.WebControls.Unit), "200px")]
    9595                public override Unit Height
    9696                {
    9797                        get
     
    120120
    121121                [Category("CKEditor Basic Settings")]
    122122                [Description("The editor width in CSS size format or pixel integer.")]
    123                 [DefaultValue("100%")]
     123                [DefaultValue(typeof(System.Web.UI.WebControls.Unit), "100%")]
    124124                public override Unit Width
    125125                {
    126126                        get
     
    480480                [PersistenceMode(PersistenceMode.Attribute)]
    481481                [Category("CKEditor Other Settings")]
    482482                [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.")]
    483                 [DefaultValue("")]
     483                [DefaultValue(typeof(Array), null)]
    484484                public string[] IndentClasses { get { return config.indentClasses; } set { config.indentClasses = value; } }
    485485
    486486                [Category("CKEditor Other Settings")]
     
    527527                [PersistenceMode(PersistenceMode.Attribute)]
    528528                [Category("CKEditor Other Settings")]
    529529                [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.")]
    530                 [DefaultValue("")]
    531                 public string[] ProtectedSource
    532                 {
    533                         get
    534                         {
    535                                 string[] retVal = new string[config.protectedSource.Length];
    536                                 try { retVal = (string[])config.protectedSource; }
    537                                 catch { }
    538                                 return retVal;
    539                         }
    540                         set { config.protectedSource = value; }
    541                 }
     530                [DefaultValue(typeof(Array), null)]
     531                public string[] ProtectedSource { get { return config.protectedSource; } set { config.protectedSource = value; } }
    542532
    543533                [Category("CKEditor Other Settings")]
    544534                [Description(@"The dialog contents to removed. It's a string composed by dialog name and tab name with a colon between them.
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy