vanilla ckeditor-3.5.4

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

diff --git a/_source/core/dom/walker.js b/_source/core/dom/walker.js
index e993f4d..7f430b8 100644 (file)
--- 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
 \r
        CKEDITOR.dom.element.prototype.isBlockBoundary = function( customNodeNames )\r
        {\r
-               var nodeNameMatches = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} );\r
+               var nodeNameMatches = customNodeNames ?\r
+                       CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$block, customNodeNames || {} ) :\r
+                       CKEDITOR.dtd.$block;\r
 \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