Ticket #2970: 2970.patch

_source/core/tools.js

@@ -42 +42 @@
                  * @param {Object} target The object to be extended.
                  * @param {Object} source[,souce(n)] The objects from which copy
                  *              properties. Any number of objects can be passed to this function.
-                 * @param {Boolean} [overwrite] Indicates that properties already present
-                 *              in the target object must be overwritten. This must be the last
-                 *              parameter in the function call.
+                 * @param {Boolean|Array} [overwrite] If 'true' is specified it
+                 *            indicates that properties already present in the target
+                 *            object must be overwritten. If an Array of property names
+                 *            is specified, only names specified in the collection will
+                 *            be received from the source object. 
+                 *            This must be the last parameter in the function call.
                  * @returns {Object} the extended object (target).
                  * @example
                  * // Create the sample object.
@@ -67 +70 @@
                 extend : function( target )
                 {
                         var argsLength = arguments.length,
-                                overwrite = arguments[ argsLength - 1 ];
+                                overwrite = arguments[ argsLength - 1 ],
+                                //whether it's a to-receiving properties list
+                                isList;
 
-                        if ( typeof overwrite == 'boolean' )
-                                argsLength--;
+                        if ( typeof overwrite == 'boolean'
+                        || ( isList = CKEDITOR.tools.isArray( overwrite ) ) )
+                            argsLength--;
                         else
                                 overwrite = false;
 
@@ -80 +86 @@
 
                                 for ( var propertyName in source )
                                 {
-                                        if ( overwrite || target[ propertyName ] == undefined )
+                                        if ( ( overwrite === true || target[ propertyName ] == undefined )
+                                                //only copy property in the list
+                                                || ( isList && CKEDITOR.tools.indexOf( overwrite, propertyName ) != -1 ) )
                                                 target[ propertyName ] = source[ propertyName ];
                                 }
                         }

_source/core/dom/documentFragment.js

@@ -2 +2 @@
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
-
+/**
+ * DocumentFragment is a "lightweight" or "minimal" Document object. It is
+ * commonly used to extract a portion of a document's tree or to create a new
+ * fragment of a document. Various operations may take DocumentFragment objects
+ * as arguments and results in all the child nodes of the DocumentFragment being
+ * moved to the child list of this node.
+ * 
+ * @param {Object} ownerDocument
+ */
 CKEDITOR.dom.documentFragment = function( ownerDocument )
 {
-        this.$ = CKEDITOR.env.ie ? ownerDocument.$.createElement( 'div' ) : ownerDocument.$.createDocumentFragment();
+        ownerDocument = ownerDocument || CKEDITOR.document;
+        this.$ = ownerDocument.$.createDocumentFragment();
 };
 
-(function()
-{
-        var elementPrototype = CKEDITOR.dom.element.prototype;
-
-        CKEDITOR.dom.documentFragment.prototype =
-        {
-                type : CKEDITOR.NODE_DOCUMENT_FRAGMENT,
-
-                append : elementPrototype.append,
-
-                getFirst : elementPrototype.getFirst,
-
-                getLast : elementPrototype.getLast,
-
-                appendTo : function( targetElement )
-                {
-                        if ( CKEDITOR.env.ie )
-                                elementPrototype.moveChildren.call( this, targetElement );
-                        else
-                                targetElement.$.appendChild( this.$ );
-                },
-
-                moveChildren : elementPrototype.moveChildren,
-
-                insertAfterNode : function( node )
-                {
-                        var $ = this.$;
-                        var $node = node.$;
-                        var $parent = $node.parentNode;
-
-                        if ( CKEDITOR.env.ie )
-                        {
-                                for ( var child ; child = $.lastChild ; )
-                                        $parent.insertBefore( $.removeChild( child ), $node.nextSibling );
-                        }
-                        else
-                                $parent.insertBefore( $, $node.nextSibling );
-                },
-
-                replace : function( nodeToReplace )
-                {
-                        this.insertAfterNode( nodeToReplace );
-                        nodeToReplace.remove();
-                },
-
-                trim : elementPrototype.trim,
-                ltrim : elementPrototype.ltrim,
-                rtrim : elementPrototype.rtrim,
-                getFirst : elementPrototype.getFirst,
-                getLast : elementPrototype.getLast,
-                getDocument : elementPrototype.getDocument,
-                getChildCount : elementPrototype.getChildCount,
-                getChild : elementPrototype.getChild,
-                contains : elementPrototype.contains
-        };
-})();
+CKEDITOR.tools.extend( CKEDITOR.dom.documentFragment.prototype,
+    CKEDITOR.dom.element.prototype,
+    {
+        type :CKEDITOR.NODE_DOCUMENT_FRAGMENT,
+        insertAfterNode : function( node )
+        {
+                var $ = this.$;
+                var $node = node.$;
+                var $parent = $node.parentNode;
+                $parent.insertBefore( $, $node.nextSibling );
+        }
+    }, [ 'type', 'append', 'getFirst', 'getLast', 'appendTo', 'moveChildren',
+        'insertAfterNode', 'replace', 'trim', 'ltrim', 'rtrim', 'getFirst',
+        'getLast', 'getDocument', 'getChildCount', 'getChild', 'getChildren',
+        'contains' ] );