Ticket #3091: 3091.patch

_source/plugins/styles/plugin.js

@@ -277 +277 @@
 
                 // Get the first node to be processed and the last, which concludes the
                 // processing.
-                var boundaryNodes = range.getBoundaryNodes();
-                var firstNode = boundaryNodes.startNode;
-                var lastNode = boundaryNodes.endNode;
+        var enLargedBookmark = range.createBookmark(),
+          firstNode = enLargedBookmark.startNode,
+                  lastNode = enLargedBookmark.endNode;
 
-                // The detection algorithm below skips the contents inside bookmark nodes, so
-                // we'll need to make sure lastNode isn't the   inside a bookmark node.
-                var lastParent = lastNode.getParent();
-                if ( lastParent && lastParent.getAttribute( '_fck_bookmark' ) )
-                        lastNode = lastParent;
 
-                if ( lastNode.equals( firstNode ) )
-                {
-                        // If the last node is the same as the the first one, we must move
-                        // it to the next one, otherwise the first one will not be
-                        // processed.
-                        lastNode = lastNode.getNextSourceNode( true );
-
-                        // It may happen that there are no more nodes after it (the end of
-                        // the document), so we must add something there to make our code
-                        // simpler.
-                        if ( !lastNode )
-                        {
-                                lastNode = document.createText( '' );
-                                lastNode.insertAfter( firstNode );
-                        }
-                }
-
-                var currentNode = firstNode;
+                var currentNode = firstNode.getNextSourceNode( true );
 
                 var styleRange;
 
@@ -356 +334 @@
                                                 if ( nodeType == CKEDITOR.NODE_TEXT || ( nodeType == CKEDITOR.NODE_ELEMENT && !currentNode.getChildCount() && currentNode.$.offsetWidth ) )
                                                 {
                                                         var includedNode = currentNode;
-                                                        var parentNode;
+                                                        var parentNode, nextNode;
+                                                        
+                                                        // Bypass bookmark nodes.
+                                                        if( ( nextNode = includedNode.getNext() ) && 
+                                                                nextNode.getAttribute( '_fck_bookmark' ) )
+                                                                includedNode = nextNode;
 
                                                         // This node is about to be included completelly, but,
                                                         // if this is the last node in its parent, we must also
@@ -460 +443 @@
                         }
                 }
 
-//              this._FixBookmarkStart( startNode );
-
+                range.moveToBookmark( enLargedBookmark );
                 range.moveToBookmark( bookmark );
         }