Ticket #2803: 2803.patch

_source/plugins/dialog/plugin.js

@@ -441 +441 @@
                 // Execute onLoad for the first show.
                 this.fireOnce( 'load', {} );
                 this.fire( 'show', {} );
+
+                // Save the initial values of the dialog.
+                this.foreach( function( contentObj ) { contentObj.setInitValue && contentObj.setInitValue(); } );
         },
 
         /**
@@ -469 +472 @@
         })(),
 
         /**
-         * Pushes the current values of all inputs in the dialog into the default stack.
-         * @example
-         * dialogObj.pushDefault();
-         * @returns {CKEDITOR.dialog} The current dialog object.
-         */
-        pushDefault : (function()
-        {
-                var fn = function( widget ){ if ( widget.pushDefault ) widget.pushDefault(); };
-                return function(){ this.foreach( fn ); return this; };
-        })(),
-
-        /**
-         * Pops the current default values of all inputs in the dialog.
-         * @example
-         * dialogObj.popDefault();
-         * @returns {CKEDITOR.dialog} The current dialog object.
-         */
-        popDefault : (function()
-        {
-                var fn = function( widget ){ if ( widget.popDefault ) widget.popDefault(); };
-                return function(){ this.foreach( fn ); return this; };
-        })(),
-
-        /**
          * Hides the dialog box.
          * @example
          * dialogObj.hide();
@@ -535 +514 @@
                         CKEDITOR.dialog._.currentZIndex -= 10;
 
                 this.fire( 'hide', {} );
+
+                // Reset the initial values of the dialog.
+                this.foreach( function( contentObj ) { contentObj.resetInitValue && contentObj.resetInitValue(); } );
         },
 
         /**

_source/plugins/dialogui/plugin.js

@@ -12 +12 @@
         var initPrivateObject = function( elementDefinition )
         {
                 this._ || ( this._ = {} );
-                this._['default'] = [ elementDefinition['default'] || '' ];
+                this._['default'] = this._.initValue = elementDefinition['default'] || '' ;
                 var args = [ this._ ];
                 for ( var i = 1 ; i < arguments.length ; i++ )
                         args.push( arguments[i] );
@@ -38 +38 @@
         {
                 isChanged : function()
                 {
-                        return this.getValue() != this.getDefault();
+                        return this.getValue() != this.getInitValue();
                 },
 
                 reset : function()
                 {
-                        this.setValue( this.getDefault() );
+                        this.setValue( this.getInitValue() );
                 },
 
-                getDefault : function()
+                setInitValue : function()
                 {
-                        var defs = this._['default'];
-                        return defs[ defs.length - 1 ];
+                        this._.initValue = this.getValue();
                 },
 
-                pushDefault : function()
+                resetInitValue : function()
                 {
-                        this._['default'].push( this.getValue() );
+                        this._.initValue = this._['default'];
                 },
 
-                popDefault : function()
+                getInitValue : function()
                 {
-                        this._['default'].pop();
+                        return this._.initValue;
                 }
         },
         commonEventProcessors = CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,
@@ -276 +275 @@
                                         var html = [ '<div class="cke_dialog_ui_input_textarea"><textarea class="cke_dialog_ui_input_textarea" id="', domId, '" ' ];
                                         for ( var i in attributes )
                                                 html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[i] ) + '" ' );
-                                        html.push( '>', CKEDITOR.tools.htmlEncode( me.getDefault() ), '</textarea></div>' );
+                                        html.push( '>', CKEDITOR.tools.htmlEncode( me._['default'] ), '</textarea></div>' );
                                         return html.join( '' );
                                 }
                                 CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
@@ -356 +355 @@
                                         return;
 
                                 initPrivateObject.call( this, elementDefinition );
-                                if ( this.getDefault() == '' )
-                                        this._['default'] = [ elementDefinition.items[0][1] ] ;
+                                if ( this._['default'] == '' )
+                                        this._['default'] = this._.initValue = elementDefinition.items[0][1] ;
                                 if ( elementDefinition.validate )
                                         this.validate = elementDefinition.valdiate;
                                 var children = [], me = this;
@@ -392 +391 @@
                                                                 name : commonName,
                                                                 value : value
                                                         };
-                                                if ( me.getDefault() == value )
+                                                if ( me._['default'] == value )
                                                         inputAttributes.checked = 'checked';
                                                 cleanInnerDefinition( inputDefinition );
                                                 cleanInnerDefinition( labelDefinition );

_source/plugins/flash/dialogs/flash.js

@@ -298 +298 @@
 
                         // Don't call onChange before onShow.
                         this.allowOnChange = false;
-
-                        // Pop the default values from default value set that are pushed in onShow().
-                        this.popDefault();
                 },
                 onShow : function()
                 {
@@ -358 +355 @@
                         updatePreview( this );
 
                         this.allowOnChange = true;
-                        this.pushDefault();
                         this.getContentElement( 'info', 'txtUrl' ).focus();
                 },
                 onOk : function()

_source/plugins/forms/dialogs/select.js

@@ -101 +101 @@
                                 this.editObj = this.getParentEditor().document.createElement( 'select' );
                         }
 
-                        this.pushDefault();
                         this.getContentElement( 'info', 'txtName' ).focus();
                 },
                 onOk : function()

_source/plugins/image/dialogs/image.js

@@ -618 +618 @@
                         }
 
                         this.allowOnChange = true;
-                        this.pushDefault();
                         this.getContentElement( 'info', 'txtUrl' ).focus();
                 },
                 onLoad : function()
@@ -688 +687 @@
 
                         // Don't call onChange before onShow.
                         this.allowOnChange = false;
-
-                        // Pop the default values from default value set that are pushed in onShow().
-                        this.popDefault();
                 },
                 contents : [
                         {

_source/plugins/link/dialogs/anchor.js

@@ -74 +74 @@
                                         this.saveSelection();
                                 }
                         }
-                        this.pushDefault();
                         this.getContentElement( 'info', 'txtName' ).focus();
                 },
                 onHide : function()
                 {
-                        // Pop the default values from default value set that are pushed in onShow().
-                        this.popDefault();
                 },
                 contents : [
                         {

_source/plugins/link/dialogs/link.js

@@ -710 +710 @@
                                 }
                         }
 
-                        // Push the current values into the dialog default value stack.
-                        this.pushDefault();
-
                         // Put focus into the first most likely used input.
                         var linkType = this.getValueOf( 'info', 'linkType' );
                         if ( linkType == 'url' )
@@ -862 +859 @@
                 },
                 onHide : function()
                 {
-                        // Pop the default values from default value set that are pushed in onShow().
-                        this.popDefault();
                 }
         };
 } );

_source/plugins/table/dialogs/table.js

@@ -69 +69 @@
 
                                 // Save a reference to the selected table, and push a new set of default values.
                                 this._.selectedElement = selectedTable;
-                                this.pushDefault();
                         }
                         else
                         {
@@ -83 +82 @@
                 },
                 onHide : function()
                 {
-                        if ( this._.selectedElement )
-                                this.popDefault();
                 },
                 onOk : function()
                 {