Changeset 7508

Timestamp:

06/21/12 18:12:25 (11 months ago)

Author:

garry.yao

Message:

#8997: Fixed style not copied from the list root when converting.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/list/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -56 +56 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8979">#8979</a> : Overriding matches will not any more interfere on the Font size combo.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/5447">#5447</a> : Trimmed anchor name on dialog field.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8997">#8997</a> : Styles are lost on sub-lists when convering list type.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/list/plugin.js

@@ -300 +300 @@
 
                 var root = groupObj.root,
-                        fakeParent = root.getDocument().createElement( this.type );
-                // Copy all attributes, except from 'start' and 'type'.
-                root.copyAttributes( fakeParent, { start : 1, type : 1 } );
-                // The list-style-type property should be ignored.
-                fakeParent.removeStyle( 'list-style-type' );
+                        doc = root.getDocument(),
+                        listNode,
+                        newListNode;
 
                 for ( i = 0 ; i < selectedListItems.length ; i++ )
                 {
                         var listIndex = selectedListItems[i].getCustomData( 'listarray_index' );
-                        listArray[listIndex].parent = fakeParent;
-                }
+                        listNode = listArray[ listIndex ].parent;
+
+                        // Switch to new list node for this particular item.
+                        if ( !listNode.is( this.type ) )
+                        {
+                                newListNode = doc.createElement( this.type );
+                                // Copy all attributes, except from 'start' and 'type'.
+                                listNode.copyAttributes( newListNode, { start : 1, type : 1 } );
+                                // The list-style-type property should be ignored.
+                                newListNode.removeStyle( 'list-style-type' );
+                                listArray[ listIndex ].parent = newListNode;
+                        }
+                }
+
                 var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
                 var child, length = newList.listNode.getChildCount();