Changeset 7520

Timestamp:

06/27/12 18:30:09 (11 months ago)

Author:

garry.yao

Message:

#9057: Fixed decrease indent of list item don't need to establish new block.

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -64 +64 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8978">#8978</a> : [IE] Saved editor text selection is lost after close menu.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/9022">#9022</a> : [IE7] Fixed wrong selection introduced in empty editor document when click to the bottom-right of the document.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/9057">#9057</a> : Unexpected block established when decreasing indent of a styled list item.</li>
         </ul>
         <h3>

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

@@ -109 +109 @@
                         while ( 1 )
                         {
-                                var item = listArray[ currentIndex ];
+                                var item = listArray[ currentIndex ],
+                                        itemGrandParent = item.grandparent;
 
                                 orgDir = item.element.getDirection( 1 );
@@ -145 +146 @@
                                         currentIndex = listData.nextIndex;
                                 }
-                                else if ( item.indent == -1 && !baseIndex && item.grandparent )
-                                {
-                                        if ( listNodeNames[ item.grandparent.getName() ] )
+                                else if ( item.indent == -1 && !baseIndex && itemGrandParent )
+                                {
+                                        if ( listNodeNames[ itemGrandParent.getName() ] )
                                                 currentListItem = item.element.clone( false, true );
                                         else
@@ -154 +155 @@
                                         // Migrate all children to the new container,
                                         // apply the proper text direction.
-                                        var dirLoose = item.grandparent.getDirection( 1 ) != orgDir,
-                                                needsBlock = currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT &&
-                                                                         paragraphMode != CKEDITOR.ENTER_BR,
+                                        var dirLoose = itemGrandParent.getDirection( 1 ) != orgDir,
                                                 li = item.element,
                                                 className = li.getAttribute( 'class' ),
                                                 style = li.getAttribute( 'style' );
+
+                                        var needsBlock = currentListItem.type ==
+                                                         CKEDITOR.NODE_DOCUMENT_FRAGMENT &&
+                                                         ( paragraphMode != CKEDITOR.ENTER_BR || dirLoose ||
+                                                           style || className );
 
                                         var child, count = item.contents.length;
@@ -179 +183 @@
                                                         className && child.addClass( className );
                                                 }
-                                                else if ( dirLoose || needsBlock || style || className )
+                                                else if ( needsBlock )
                                                 {
                                                         // Establish new block to hold text direction and styles.