vanilla ckeditor-3.4.3

[ckeditor.git] / _source / core / dom / walker.js

diff --git a/_source/core/dom/walker.js b/_source/core/dom/walker.js
index ae9dfec..126f3f2 100644 (file)
--- a/_source/core/dom/walker.js
+++ b/_source/core/dom/walker.js
@@ -334,16 +334,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                'table-column' : 1,\r
                'table-cell' : 1,\r
                'table-caption' : 1\r
-       },\r
-       blockBoundaryNodeNameMatch = { hr : 1 };\r
+       };\r
 \r
        CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames )\r
        {\r
-               var nodeNameMatches = CKEDITOR.tools.extend( {},\r
-                                                                                                       blockBoundaryNodeNameMatch, customNodeNames || {} );\r
+               var nodeNameMatches = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} );\r
 \r
-               return blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ] ||\r
-                       nodeNameMatches[ this.getName() ];\r
+               // Don't consider floated formatting as block boundary, fall back to dtd check in that case. (#6297)\r
+               return this.getComputedStyle( 'float' ) == 'none' && blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ]\r
+                               || nodeNameMatches[ this.getName() ];\r
        };\r
 \r
        CKEDITOR.dom.walker.blockBoundary = function( customNodeNames )\r