Ticket #8874: 8874.patch

_source/core/dom/comment.js

@@ -35 +35 @@
 CKEDITOR.tools.extend( CKEDITOR.dom.comment.prototype,
         /** @lends CKEDITOR.dom.comment.prototype */
         {
-                type : CKEDITOR.NODE_COMMENT,
-
                 getOuterHtml : function()
                 {
                         return '<!--' + this.$.nodeValue + '-->';

_source/core/dom/text.js

@@ -49 +49 @@
 CKEDITOR.tools.extend( CKEDITOR.dom.text.prototype,
         /** @lends CKEDITOR.dom.text.prototype */
         {
-                /**
-                 * The node type. This is a constant value set to
-                 * {@link CKEDITOR.NODE_TEXT}.
-                 * @type Number
-                 * @example
-                 */
-                type : CKEDITOR.NODE_TEXT,
-
                 getLength : function()
                 {
                         return this.$.nodeValue.length;

_source/core/dom/documentfragment.js

@@ -20 +20 @@
 CKEDITOR.tools.extend( CKEDITOR.dom.documentFragment.prototype,
         CKEDITOR.dom.element.prototype,
         {
-                type : CKEDITOR.NODE_DOCUMENT_FRAGMENT,
                 insertAfterNode : function( node )
                 {
                         node = node.$;

_source/core/dom/domobject.js

@@ -29 +29 @@
                  * alert( element.$.nodeType );  // "1"
                  */
                 this.$ = nativeDomObject;
+
+                // CKEDITOR.NODE_(TYPE) constants should match the DOM node type values.
+                this.type = nativeDomObject.nodeType;
         }
 };
 

_source/core/dom/node.js

@@ -27 +27 @@
                         : domNode.nodeType == CKEDITOR.NODE_ELEMENT ? 'element'
                         : domNode.nodeType == CKEDITOR.NODE_TEXT ? 'text'
                         : domNode.nodeType == CKEDITOR.NODE_COMMENT ? 'comment'
+                        : domNode.nodeType == CKEDITOR.NODE_DOCUMENT_FRAGMENT ? 'documentFragment'
                         : 'domObject';  // Call the base constructor otherwise.
 
                 return new CKEDITOR.dom[ type ]( domNode );
@@ -65 +66 @@
  */
 CKEDITOR.NODE_COMMENT = 8;
 
+/**
+ * Document type declaration, indicated by the <!DOCTYPE >
+ * @type {Number}
+ */
+CKEDITOR.NODE_DOCTYPE = 10;
+
+/**
+ * Document fragment node type.
+ * @type {Number}
+ */
 CKEDITOR.NODE_DOCUMENT_FRAGMENT = 11;
 
 CKEDITOR.POSITION_IDENTICAL = 0;
@@ -344 +355 @@
                         do
                         {
                                 previous = previous.previousSibling;
-                                retval = previous && new CKEDITOR.dom.node( previous );
+
+                                // Avoid returning the doc type node.
+                                retval = previous && previous.nodeType != CKEDITOR.NODE_DOCTYPE && new CKEDITOR.dom.node( previous );
                         }
                         while ( retval && evaluator && !evaluator( retval ) )
                         return retval;

_source/core/dom/element.js

@@ -109 +109 @@
         /** @lends CKEDITOR.dom.element.prototype */
         {
                 /**
-                 * The node type. This is a constant value set to
-                 * {@link CKEDITOR.NODE_ELEMENT}.
-                 * @type Number
-                 * @example
-                 */
-                type : CKEDITOR.NODE_ELEMENT,
-
-                /**
                  * Adds a CSS class to the element. It appends the class to the
                  * already existing names.
                  * @param {String} className The name of the class to be added.