From 7da825e83b9b41ea7b6832b259af744282e876eb Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Wed, 5 Sep 2018 23:43:48 +0200 Subject: [PATCH] Reverted unnecessary changes. --- core/style.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/core/style.js b/core/style.js index fe5866cedb3..a2615c036da 100644 --- a/core/style.js +++ b/core/style.js @@ -788,12 +788,9 @@ CKEDITOR.STYLE_OBJECT = 3; ); } - function isElement( currentNode ) { - return currentNode && currentNode.type == CKEDITOR.NODE_ELEMENT; - } - - function isReadonlyOrEmptyElement( currentNode, nodeIsReadonly ) { - return nodeIsReadonly || ( isElement( currentNode ) && !currentNode.getChildCount() ); + function checkIfTextOrReadonlyOrEmptyElement( currentNode, nodeIsReadonly ) { + var nodeType = currentNode.type; + return nodeType == CKEDITOR.NODE_TEXT || nodeIsReadonly || ( nodeType == CKEDITOR.NODE_ELEMENT && !currentNode.getChildCount() ); } // Checks if position is a subset of posBitFlags and that nodeA fulfills style def rule. @@ -908,8 +905,8 @@ CKEDITOR.STYLE_OBJECT = 3; } // Non element nodes, readonly elements, or empty - // elements can be added completely to the range (#2294). - if ( !isElement( currentNode ) || isReadonlyOrEmptyElement( currentNode, nodeIsReadonly ) ) { + // elements can be added completely to the range. + if ( checkIfTextOrReadonlyOrEmptyElement( currentNode, nodeIsReadonly ) ) { var includedNode = currentNode; var parentNode;