Ticket #6297: 6297_rev.patch

_source/core/dom/walker.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -342 +342 @@
                 var nodeNameMatches = CKEDITOR.tools.extend( {},
                                                                                                         blockBoundaryNodeNameMatch, customNodeNames || {} );
 
+
+                //no matter of 'display' mode check if image has any neighbor
+                //if it has any do not break and keep all of them together              
+                if( this.getName() == 'img' )
+                {
+                        if( this.getParent().getChildCount() > 1 )
+                        {
+                                return false;
+                        }
+                }
+
                 return blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ] ||
                         nodeNameMatches[ this.getName() ];
         };