Ticket #8413: 8413.patch

_source/core/dom/comment.js

@@ -12 +12 @@
 {
         base : CKEDITOR.dom.node,
 
-        $ : function( text, ownerDocument )
+    /**
+     * The comment node type.
+     * {@link CKEDITOR.NODE_COMMENT}.
+     * @type Number
+     * @example
+     */
+    type : CKEDITOR.NODE_COMMENT,
+
+        $ : function( comment, ownerDocument )
         {
-                if ( typeof text == 'string' )
-                        text = ( ownerDocument ? ownerDocument.$ : document ).createComment( text );
+                if ( typeof comment == 'string' )
+                        comment = ( ownerDocument ? ownerDocument.$ : document ).createComment( comment );
 
-                this.base( text );
+                // Call the base constructor (we must not call CKEDITOR.dom.node).
+                CKEDITOR.dom.domObject.call( this, comment );
         },
 
         proto :

_source/core/dom/node.js

@@ -23 +23 @@
 {
         if ( domNode )
         {
-                switch ( domNode.nodeType )
-                {
-                        // Safari don't consider document as element node type. (#3389)
-                        case CKEDITOR.NODE_DOCUMENT :
-                                return new CKEDITOR.dom.document( domNode );
+                var constructor = domNode.nodeType == CKEDITOR.NODE_DOCUMENT ? 'document'
+                        : domNode.nodeType == CKEDITOR.NODE_ELEMENT ? 'element'
+                        : domNode.nodeType == CKEDITOR.NODE_TEXT ? 'text'
+                        : domNode.nodeType == CKEDITOR.NODE_COMMENT ? 'comment'
+                        : 'domObject';  // Call the base constructor otherwise.
 
-                        case CKEDITOR.NODE_ELEMENT :
-                                return new CKEDITOR.dom.element( domNode );
-
-                        case CKEDITOR.NODE_TEXT :
-                                return new CKEDITOR.dom.text( domNode );
-                }
-
-                // Call the base constructor.
-                CKEDITOR.dom.domObject.call( this, domNode );
+                return new CKEDITOR.dom[ constructor ]( domNode );
         }
 
         return this;

_source/core/dom/range.js

@@ -1014 +1014 @@
                                                         // whitespaces at the end.
                                                         isWhiteSpace = false;
 
-                                                        if ( sibling.type == CKEDITOR.NODE_TEXT )
+                                                        if ( sibling.type == CKEDITOR.NODE_COMMENT )
+                                                        {
+                                                                sibling = sibling.getPrevious();
+                                                                continue;
+                                                        }
+                                                        else if ( sibling.type == CKEDITOR.NODE_TEXT )
                                                         {
                                                                 siblingText = sibling.getText();