Changeset 6529

Timestamp:

03/04/11 16:18:19 (2 years ago)

Author:

wwalc

Message:

Fixed object serialization, toolbar generation

Location:

CKEditor.NET/trunk/CKEditor.NET

Files:

• CKEditorConfig.cs (modified) (1 diff)
• CKEditorControl.cs (modified) (3 diffs)

CKEditor.NET/trunk/CKEditor.NET/CKEditorConfig.cs

@@ -258 +258 @@
                                 return false;
                         for (int i = 0; i < obj1.Length; i++)
-                                if ((obj1[i].GetType().IsArray) && !campareArray((object[])obj1[i], (object[])obj1[i]))
+                                if ((obj1[i].GetType().IsArray) && !campareArray((object[])obj1[i], (object[])obj2[i]))
                                         return false;
                                 else if (obj1[i].ToString() != obj2[i].ToString())

CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs

@@ -720 +720 @@
                                         {
                                                 string[] item = valueTab[i].Split(new char[] { '|' });
+                                                for (int k = 0; k < item.Length; k++)
+                                                        item[k] = item[k].Trim();
                                                 if (item.Length == 1 && item[0] == "/") retVal[i] = item[0];
                                                 else retVal[i] = item;
@@ -776 +778 @@
                                         {
                                                 string[] item = valueTab[i].Split(new char[] { '|' });
+                                                for (int k = 0; k < item.Length; k++)
+                                                        item[k] = item[k].Trim();
                                                 if (item.Length == 1 && item[0] == "/") retVal[i] = item[0];
                                                 else retVal[i] = item;
@@ -843 +847 @@
                                         {
                                                 string[] item = valueTab[i].Split(new char[] { '|' });
+                                                for (int k = 0; k < item.Length; k++)
+                                                        item[k] = item[k].Trim();
                                                 if (item.Length == 1 && item[0] == "/") retVal[i] = item[0];
                                                 else retVal[i] = item;