Index: /CKEditor.NET/trunk/CHANGES.html =================================================================== --- /CKEditor.NET/trunk/CHANGES.html (revision 7591) +++ /CKEditor.NET/trunk/CHANGES.html (revision 7592) @@ -81,4 +81,6 @@

Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs =================================================================== --- /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs (revision 7591) +++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs (revision 7592) @@ -200,9 +200,31 @@ oc.Append(", \"on\" : {").Append(((object[])objArray)[0]).Append(" : ").Append(((object[])objArray)[1]).Append(" } "); } + else if (propertyInfo.Name == "stylesheetParser_skipSelectors" || propertyInfo.Name == "stylesheetParser_validSelectors") + { + string valueToJSON = (string)propertyInfo.GetValue(obj, new object[0]); + string staticValueToCompare = (string)staticPropertyInfoDictionary[propertyInfo.Name]; + if (valueToJSON != staticValueToCompare) + oc.Append(", " + propertyInfo.Name + ": " + valueToJSON); + } + else if (propertyInfo.Name == "entities_processNumerical") + { + string valueToJSON = (string)propertyInfo.GetValue(obj, new object[0]); + string staticValueToCompare = (string)staticPropertyInfoDictionary[propertyInfo.Name]; + if (valueToJSON != staticValueToCompare) + { + if (valueToJSON.ToLower() == false.ToString().ToLower() || valueToJSON.ToLower() == true.ToString().ToLower()) + oc.Append(", " + propertyInfo.Name + ": " + bool.Parse(valueToJSON)); + else + oc.Append(", " + propertyInfo.Name + ": " + valueToJSON); + } + } else { object valueToJSON = propertyInfo.GetValue(obj, new object[0]); object staticValueToCompare = staticPropertyInfoDictionary[propertyInfo.Name]; - if (!forceAddToJSON && !valueToJSON.GetType().IsArray && !staticValueToCompare.GetType().IsArray && staticValueToCompare.ToString() == valueToJSON.ToString()) + if (valueToJSON == null && staticValueToCompare == null) + continue; + else if (valueToJSON.GetType().IsArray && staticValueToCompare == null) { } + else if (!forceAddToJSON && !valueToJSON.GetType().IsArray && !staticValueToCompare.GetType().IsArray && staticValueToCompare.ToString() == valueToJSON.ToString()) continue; else if (!forceAddToJSON && valueToJSON.GetType().IsArray && staticValueToCompare.GetType().IsArray) @@ -364,4 +386,11 @@ /// + /// Extra height in pixel to leave between the bottom boundary of content with document size when auto resizing. + /// Default Value: 0 + /// + [CKSerializable] + public int autoGrow_bottomSpace { get; set; } + + /// /// The maximum height to which the editor can reach using AutoGrow. Zero means unlimited. /// Default Value: 0 @@ -378,4 +407,18 @@ /// + /// Whether to have the auto grow happen on editor creation. + /// Default Value: false + /// + [CKSerializable] + public bool autoGrow_onStartup { get; set; } + + /// + /// Whether automatically create wrapping blocks around inline contents inside document body, this helps to ensure the integrality of the block enter mode. Note: Changing the default value might introduce unpredictable usability issues. + /// Default Value: true + /// + [CKSerializable] + public bool autoParagraph { get; set; } + + /// /// Whether the replaced element (usually a textarea) is to be updated automatically when posting the form containing the editor. /// Default Value: true @@ -397,4 +440,11 @@ [CKSerializable] public string baseHref { get; set; } + + /// + /// Whether to escape basic HTML entities in the document, including: nbsp, gt, lt, amp. + /// Default Value: true + /// + [CKSerializable] + public bool basicEntities { get; set; } /// @@ -458,4 +508,11 @@ [CKSerializable] public string colorButton_colors { get; set; } + + /// + /// Whether to enable the More Colors button in the color selectors. + /// Default Value: true + /// + [CKSerializable] + public bool colorButton_enableMore { get; set; } /// @@ -569,4 +626,11 @@ /// + /// A setting that stores CSS rules to be injected into the page with styles to be applied to the tooltip element. + /// Default Value: "" + /// + [CKSerializable] + public string devtools_styles { get; set; } + + /// /// The color of the dialog background cover. It should be a valid CSS color string. /// Default Value: "white" @@ -723,4 +787,12 @@ [CKSerializable] public bool entities_latin { get; set; } + + /// + /// Whether to convert all remaining characters not included in the ASCII character table to their relative decimal numeric representation of HTML entity. + /// When set to force, it will convert all entities into this format. For example the phrase "This is Chinese: 汉语." is output as "This is Chinese: 汉语." + /// Default Value: false + /// + [CKSerializable] + public string entities_processNumerical { get; set; } /// @@ -1045,4 +1117,20 @@ [CKSerializable] public string indentUnit { get; set; } + + /// + /// Allows CKEditor to override jQuery.fn.val(), making it possible to use the val() function on textareas, as usual, having it synchronized with CKEditor. + /// This configuration option is global and executed during the jQuery Adapter loading. It can't be customized across editor instances. + /// Default Value: true + /// + [CKSerializable] + public bool jqueryOverrideVal { get; set; } + + /// + /// A list associating keystrokes to editor commands. Each element in the list is an array where the first item is the keystroke, + /// and the second is the name of the command to be executed. + /// Default Value: null + /// + [CKSerializable] + public object[] justifyClasses { get; set; } /// @@ -1085,4 +1173,11 @@ /// + /// The HTML to load in the editor when the "new page" command is executed. + /// Default Value: "" + /// + [CKSerializable] + public string newpage_html { get; set; } + + /// /// The file that provides the MS Word cleanup function for pasting operations. /// Note: This is a global configuration shared by all editor instances present in the page. @@ -1136,5 +1231,12 @@ /// public string[] protectedSource { get; set; } - + + /// + /// If true, makes the editor start in read-only state. Otherwise, it will check if the linked