Ticket #2797: 2797.patch

_source/core/dom/domwalker.js

@@ -219 +219 @@
         {
                 return CKEDITOR.dom.domWalker.blockBoundary( { br : 1 } );
         };
+
+        CKEDITOR.dom.domWalker.inlineElements = function( evt )
+        {
+                if ( evt.data.type != 'up' )
+                {
+                        this.stop();
+                        evt.stop();
+                        return;
+                }
+
+                var to = evt.data.to;
+                if ( to.getComputedStyle( 'display' ) != 'inline' )
+                {
+                        this.stop();
+                        evt.stop();
+                        return;
+                }
+        }
 })();

_source/core/dom/range.js

@@ -968 +968 @@
 
                                 case CKEDITOR.ENLARGE_BLOCK_CONTENTS:
                                 case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:
+                                case CKEDITOR.ENLARGE_INLINE_ELEMENTS:
                                         // DFS backward to get the block/list item boundary at or before the start.
                                         var boundaryNodes = getBoundaryNodes.apply( this ),
                                                 startNode = boundaryNodes.startNode,
                                                 endNode = boundaryNodes.endNode,
-                                                guardFunction = ( unit == CKEDITOR.ENLARGE_BLOCK_CONTENTS ?
-                                                        CKEDITOR.dom.domWalker.blockBoundary() :
-                                                        CKEDITOR.dom.domWalker.listItemBoundary() ),
-                                                walker = new CKEDITOR.dom.domWalker( startNode ),
+                                                guardFunction;
+
+                                        if ( unit == CKEDITOR.ENLARGE_BLOCK_CONTENTS )
+                                                guardFunction = CKEDITOR.dom.domWalker.blockBoundary();
+                                        else if ( unit == CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS )
+                                                guardFunction = CKEDITOR.dom.domWalker.listItemBoundary();
+                                        else
+                                                guardFunction = CKEDITOR.dom.domWalker.inlineElements;
+
+                                        var walker = new CKEDITOR.dom.domWalker( startNode ),
                                                 data = walker.reverse( guardFunction ),
                                                 boundaryEvent = data.events.shift();
 
@@ -1304 +1311 @@
 CKEDITOR.ENLARGE_ELEMENT = 1;
 CKEDITOR.ENLARGE_BLOCK_CONTENTS = 2;
 CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS = 3;
+CKEDITOR.ENLARGE_INLINE_ELEMENTS = 4;

_source/plugins/styles/plugin.js

@@ -223 +223 @@
                 var bookmark = range.createBookmark();
 
                 // Expand the range.
-                range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+                range.enlarge( CKEDITOR.ENLARGE_INLINE_ELEMENTS );
                 range.trim();
 
                 // Get the first node to be processed and the last, which concludes the