X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fcore%2Fdom%2Fwalker.js;h=7f430b8ad026c1a4ddf66ef0bbcdcf3e7401190f;hp=e993f4d3c4574719e694ab5f74ff1cc3b5658f8c;hb=1056598c95187351dc58f4991d331e2258d038b5;hpb=4e90e78dc97789709ee7404359a5517540c27553 diff --git a/_source/core/dom/walker.js b/_source/core/dom/walker.js index e993f4d..7f430b8 100644 --- a/_source/core/dom/walker.js +++ b/_source/core/dom/walker.js @@ -338,7 +338,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames ) { - var nodeNameMatches = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} ); + var nodeNameMatches = customNodeNames ? + CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} ) : + CKEDITOR.dtd.$block; // Don't consider floated formatting as block boundary, fall back to dtd check in that case. (#6297) return this.getComputedStyle( 'float' ) == 'none' && blockBoundaryDisplayMatch[ this.getComputedStyle( 'display' ) ]