Ticket #4650: 4650.patch

_source/plugins/selection/plugin.js

@@ -695 +695 @@
                         if ( cache.selectedElement !== undefined )
                                 return cache.selectedElement;
 
-                        var node;
+                        var node,
+                                        type = this.getType();
 
-                        if ( this.getType() == CKEDITOR.SELECTION_ELEMENT )
+                        if ( type == CKEDITOR.SELECTION_ELEMENT )
                         {
                                 var sel = this.getNative();
 
@@ -715 +716 @@
                                         node = range.startContainer.childNodes[ range.startOffset ];
                                 }
                         }
+                        // Somtimes browser lies on selection type (e.g. text[<img />]), figure it
+                        // out by further checking the range. 
+                        else if( type == CKEDITOR.SELECTION_TEXT )
+                        {
+                                // Bookmark the selection first since 'getEnclosedNode'
+                                // call below could alter it.
+                                var bookmarks = this.createBookmarks(),
+                                                range = this.getRanges()[ 0 ];
 
-                        return cache.selectedElement = ( node ? new CKEDITOR.dom.element( node ) : null );
+                                node = range.getEnclosedNode();
+                                this.selectBookmarks( bookmarks );
+                        }
+
+                        return ( cache.selectedElement = node && node.type == CKEDITOR.NODE_ELEMENT  ? node : null );
                 },
 
                 lock : function()
                 {
                         // Call all cacheable function.
-                        this.getRanges();
-                        this.getStartElement();
                         this.getSelectedElement();
+                        this.getStartElement();
+                        this.getRanges();
 
                         // The native selection is not available when locked.
                         this._.cache.nativeSel = {};