Ticket #3758: 3758_2.patch

_source/plugins/dialog/plugin.js

@@ -98 +98 @@
                 // Completes the definition with the default values.
                 definition = CKEDITOR.tools.extend( definition( editor ), defaultDialogDefinition );
 
+                // Clone a functionally independent copy for this dialog.
+                definition = CKEDITOR.tools.clone( definition );
+
                 // Create a complex definition object, extending it with the API
                 // functions.
                 definition = new definitionObject( this, definition );

_source/core/tools.js

@@ -60 +60 @@
                  * alert( obj.cars.Porsche.color );     // red
                  * alert( clone.cars.Porsche.color );   // silver
                  */
-                clone : function( object )
+                clone : ( function()
                 {
-                        if( object === null || typeof( object ) != 'object')
-                                return object;
+                        function isImmutable( obj )
+                        {
+                                return obj === null || obj === undefined ||
+                                        ( typeof obj == 'string' ) ||
+                                        ( obj instanceof String ) ||
+                                        ( typeof obj == 'number' ) ||
+                                        ( obj instanceof Number ) ||
+                                        ( typeof obj == 'boolean' ) ||
+                                        ( obj instanceof Boolean ) ||
+                                        ( typeof obj == 'function' ) ||
+                                        ( obj instanceof Date );
+                        }
 
-                        var clone = new object.constructor();
+                        function isArray( obj )
+                        {
+                                return obj && ( typeof obj.splice == 'function' );
+                        }
 
-                        for ( var propertyName in object )
+                        function cloneObject( dict )
                         {
-                                var property = object[ propertyName ];
-                                clone[ propertyName ] = this.clone( property );
+                                var retval = {};
+
+                                for ( var i in dict )
+                                {
+                                        var value = dict[ i ];
+                                        if ( isImmutable( value ) )
+                                                retval[ i ] = value;
+                                        else if ( isArray( value ) )
+                                                retval[ i ] = cloneArray( value );
+                                        else
+                                                retval[ i ] = cloneObject( value );
+                                }
+
+                                return retval;
                         }
 
-                        return clone;
-                },
+                        function cloneArray( list )
+                        {
+                                var retval = [];
 
+                                for ( var i = 0 ; i < list.length ; i++ )
+                                {
+                                        if ( isImmutable( list[ i ] ) )
+                                                retval.push( list[ i ] );
+                                        else if ( isArray( list[ i ] ) )
+                                                retval.push( cloneArray( list[ i ] ) );
+                                        else
+                                                retval.push( cloneObject( list[ i ] ) );
+                                }
+
+                                return retval;
+                        }
+
+                        return function( obj )
+                        {
+                                if ( isImmutable( obj ) )
+                                        return obj;
+                                else if ( isArray( obj ) )
+                                        return cloneArray( obj );
+                                else
+                                        return cloneObject( obj );
+                        }
+                } )(),
+
                 /**
                  * Copy the properties from one object to another. By default, properties
                  * already present in the target object <strong>are not</strong> overwritten.