Ticket #6137: 6137_3.patch

_source/plugins/dialog/plugin.js

@@ -762 +762 @@
                         for ( var i in this._.contents )
                         {
                                 for ( var j in this._.contents[i] )
-                                        fn( this._.contents[i][j]);
+                                        fn( this._.contents[i][j] );
                         }
                         return this;
                 },
@@ -775 +775 @@
                  */
                 reset : (function()
                 {
-                        var fn = function( widget ){ if ( widget.reset ) widget.reset(); };
+                        var fn = function( widget ){ if ( widget.reset ) widget.reset( 1 ); };
                         return function(){ this.foreach( fn ); return this; };
                 })(),
 
@@ -2354 +2354 @@
                 /**
                  * Sets the value of this dialog UI object.
                  * @param {Object} value The new value.
+                 * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.
                  * @returns {CKEDITOR.dialog.uiElement} The current UI element.
                  * @example
                  * uiElement.setValue( 'Dingo' );
                  */
-                setValue : function( value )
+                setValue : function( value, noChangeEvent )
                 {
                         this.getInputElement().setValue( value );
-                        this.fire( 'change', { value : value } );
+                        !noChangeEvent && this.fire( 'change', { value : value } );
                         return this;
                 },
 

_source/plugins/dialogadvtab/plugin.js

@@ -43 +43 @@
         }
 }
 
-var isUpdating;
-
 CKEDITOR.plugins.add( 'dialogadvtab',
 {
         /**
@@ -144 +142 @@
 
                                                 updateStyle : function( name, value )
                                                 {
-                                                        if ( isUpdating )
-                                                                return;
-
-                                                        // Flag to avoid recursion.
-                                                        isUpdating = 1;
-
                                                         var styles = this.getValue();
 
                                                         // Remove the current value.
@@ -167 +159 @@
                                                                 styles += name + ': ' + value;
                                                         }
 
-                                                        this.setValue( styles );
+                                                        this.setValue( styles, true );
 
-                                                        isUpdating = 0;
                                                 },
 
                                                 setup : setupAdvParams,

_source/plugins/dialogui/plugin.js

@@ -59 +59 @@
                         return this.getValue() != this.getInitValue();
                 },
 
-                reset : function()
+                reset : function( noChangeEvent )
                 {
-                        this.setValue( this.getInitValue() );
+                        this.setValue( this.getInitValue(), noChangeEvent );
                 },
 
                 setInitValue : function()
@@ -1061 +1061 @@
                                 setValue : function( value )
                                 {
                                         !value && ( value = '' );
-                                        return CKEDITOR.ui.dialog.uiElement.prototype.setValue.call( this, value );
+                                        return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply( this, arguments );
                                 },
 
                                 keyboardFocusable : true
@@ -1156 +1156 @@
                                  * Sets the state of the checkbox.
                                  * @example
                                  * @param {Boolean} true to tick the checkbox, false to untick it.
+                                 * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.
                                  */
-                                setValue : function( checked )
+                                setValue : function( checked, noChangeEvent )
                                 {
                                         this.getInputElement().$.checked = checked;
-                                        this.fire( 'change', { value : checked } );
+                                        !noChangeEvent && this.fire( 'change', { value : checked } );
                                 },
 
                                 /**
@@ -1222 +1223 @@
                                  * Checks one of the radio buttons in this button group.
                                  * @example
                                  * @param {String} value The value of the button to be chcked.
+                                 * @param {Boolean} noChangeEvent Internal commit, to supress 'change' event on this element.
                                  */
-                                setValue : function( value )
+                                setValue : function( value, noChangeEvent )
                                 {
                                         var children = this._.children,
                                                 item;
                                         for ( var i = 0 ; ( i < children.length ) && ( item = children[i] ) ; i++ )
                                                 item.getElement().$.checked = ( item.getValue() == value );
-                                        this.fire( 'change', { value : value } );
+                                        !noChangeEvent && this.fire( 'change', { value : value } );
                                 },
 
                                 /**

_source/plugins/table/dialogs/table.js

@@ -32 +32 @@
 
                         onLoad : function()
                         {
-                                var dialog = this,
-                                        isUpdating;
+                                var dialog = this;
 
                                 var styles = dialog.getContentElement( 'advanced', 'advStyles' );
 
@@ -41 +40 @@
                                 {
                                         styles.on( 'change', function( evt )
                                                 {
-                                                        if ( isUpdating )
-                                                                return;
-
-                                                        // Flag to avoid recursion.
-                                                        isUpdating = 1;
-
                                                         // Synchronize width value.
                                                         var width = this.getStyle( 'width', '' ),
                                                                 txtWidth = dialog.getContentElement( 'info', 'txtWidth' ),
@@ -59 +52 @@
                                                                 width = parseInt( width, 10 );
                                                         }
 
-                                                        txtWidth && txtWidth.setValue( width );
-                                                        cmbWidthType && cmbWidthType.setValue( isPx ? 'pixels' : 'percents' );
+                                                        txtWidth && txtWidth.setValue( width, true );
+                                                        cmbWidthType && cmbWidthType.setValue( isPx ? 'pixels' : 'percents', true );
 
                                                         // Synchronize height value.
                                                         var height = this.getStyle( 'height', '' ),
                                                                 txtHeight = dialog.getContentElement( 'info', 'txtHeight' );
 
                                                         height && ( height = parseInt( height, 10 ) );
-                                                        txtHeight && txtHeight.setValue( height );
-
-                                                        isUpdating = 0;
+                                                        txtHeight && txtHeight.setValue( height, true );
                                                 });
                                 }
                         },