Ticket #8321: 8321_3.patch

_source/core/dom/element.js

@@ -719 +719 @@
                         return false;
                 },
 
-                isEditable : function()
+                /**
+                 * Decide whether one element is able to receive cursor.
+                 * @param {Boolean} [textCursor=true] Only consider element that could receive text child.
+                 */
+                isEditable : function( textCursor )
                 {
-                        if ( this.isReadOnly() || !this.isVisible() )
-                                return false;
-
-                        // Get the element name.
                         var name = this.getName();
 
-                        // Get the element DTD (defaults to span for unknown elements).
-                        var dtd = !CKEDITOR.dtd.$nonEditable[ name ]
-                                                && ( CKEDITOR.dtd[ name ] || CKEDITOR.dtd.span );
+                        if ( this.isReadOnly()
+                                        || this.getComputedStyle( 'display' ) == 'none'
+                                        || this.getComputedStyle( 'visibility' ) == 'hidden'
+                                        || CKEDITOR.dtd.$nonEditable[ name ] )
+                        {
+                                return false;
+                        }
 
-                        // In the DTD # == text node.
-                        return ( dtd && dtd['#'] );
+                        if ( textCursor !== false )
+                        {
+                                // Get the element DTD (defaults to span for unknown elements).
+                                var dtd = CKEDITOR.dtd[ name ] || CKEDITOR.dtd.span;
+                                // In the DTD # == text node.
+                                return ( dtd && dtd[ '#'] );
+                        }
+
+                        return true;
                 },
 
                 isIdentical : function( otherElement )

_source/core/dom/range.js

@@ -1925 +1925 @@
                                 var next;
 
                                 if ( node.type == CKEDITOR.NODE_ELEMENT
-                                                && !node.isReadOnly()
-                                                && node.isVisible()
+                                                && node.isEditable( false )
                                                 && !CKEDITOR.dtd.$nonEditable[ node.getName() ] )
                                 {
                                         next = node[ isMoveToEnd ? 'getLast' : 'getFirst' ]( nonWhitespaceOrBookmarkEval );