Ticket #3940: 3940_3.patch

_source/plugins/list/plugin.js

@@ -176 +176 @@
 
         function onSelectionChange( evt )
         {
-                var elements = evt.data.path.elements;
+                var path = evt.data.path,
+                        blockLimit = path.blockLimit,
+                        elements = path.elements,
+                        element;
 
-                for ( var i = 0 ; i < elements.length ; i++ )
+                // Grouping should only happen under blockLimit.(#3940).
+                for ( var i = 0 ; i < elements.length && ( element = elements[ i ] )
+                          && !element.equals( blockLimit ); i++ )
                 {
                         if ( listNodeNames[ elements[i].getName() ] )
                         {
@@ -425 +430 @@
                                         var path = new CKEDITOR.dom.elementPath( block ),
                                                 listNode = null,
                                                 processedFlag = false,
-                                                blockLimit = path.blockLimit;
+                                                blockLimit = path.blockLimit,
+                                                element;
 
                                         // First, try to group by a list ancestor.
-                                        for ( var i = 0 ; i < path.elements.length ; i++ )
+                                        for ( var i = 0 ; i < path.elements.length &&
+                                                  ( element = path.elements[ i ] ) && !element.equals( blockLimit ); i++ )
                                         {
-                                                var element = path.elements[i];
                                                 if ( listNodeNames[ element.getName() ] )
                                                 {
                                                         // If we've encountered a list inside a block limit

_source/core/dom/node.js

@@ -394 +394 @@
                         return ( parent && parent.nodeType == 1 ) ? new CKEDITOR.dom.node( parent ) : null;
                 },
 
-                getParents : function()
+                getParents : function( closerFirst )
                 {
                         var node = this;
                         var parents = [];
 
                         do
                         {
-                                parents.unshift( node );
+                                parents[  closerFirst ? 'push' : 'unshift' ]( node );
                         }
                         while ( ( node = node.getParent() ) )
 

_source/plugins/indent/plugin.js

@@ -116 +116 @@
                 // list's DOM tree itself. The array model demands that it knows as much as
                 // possible about the surrounding lists, we need to feed it the further
                 // ancestor node that is still a list.
-                var listParents = listNode.getParents();
+                var listParents = listNode.getParents( true );
                 for ( var i = 0 ; i < listParents.length ; i++ )
                 {
                         if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )

CHANGES.html

@@ -130 +130 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3742">#3742</a> : Fixed wrong dialog layout for dialogs without tab bar in IE RTL mode .</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3671">#3671</a> : Fixed body fixing should be applied to the real type under fake elements.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3836">#3836</a> : Fixed remove list in enterMode=BR will merge sibling text to one line.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3940">#3940</a> : Fixed list operation doesn't stop at table.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3949">#3949</a> : Fixed enterKey within pre-formatted text introduce wrong line-break.</li>
         </ul>
         <h3>