Changeset 6958 for CKEditor/trunk

Timestamp:

05/24/11 15:43:30 (2 years ago)

Author:

Saare

Message:

#7158: Iframe dialog: width and height fields are now synced with the style field.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/iframe/dialogs/iframe.js (modified) (4 diffs)

CKEditor/trunk/CHANGES.html

@@ -74 +74 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6663">#6663</a> : Table caption that contains rich text is not anymore corrupted after edit with table dialog.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7192">#7192</a> : [IE] Selecting paragrpah format in an empty editor without focus didn't bring focus into editor body.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7158">#7158</a> : Width and height fields in the iframe dialog are now synchronized with the style field.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>

CKEditor/trunk/_source/plugins/iframe/dialogs/iframe.js

@@ -49 +49 @@
                         minWidth : 350,
                         minHeight : 260,
+                        onLoad : function()
+                        {
+                                var dialog = this,
+                                        styles = dialog.getContentElement( 'advanced', 'advStyles' );
+
+                                styles && styles.on( 'change', function()
+                                        {
+                                                // Synchronize width value.
+                                                var width = parseInt( this.getStyle( 'width', '' ) || '', 10 ),
+                                                        txtWidth = dialog.getContentElement( 'info', 'width' );
+
+                                                txtWidth && txtWidth.setValue( width, true );
+
+                                                // Synchronize height value.
+                                                var height = parseInt( this.getStyle( 'height', '' ) || '', 10 ),
+                                                        txtHeight = dialog.getContentElement( 'info', 'height' );
+
+                                                txtHeight && txtHeight.setValue( height, true );
+                                        });
+                        },
                         onShow : function()
                         {
@@ -64 +84 @@
                                         this.setupContent( iframeNode, fakeImage );
                                 }
+
+                                // Call the onChange method for the widht and height fields so
+                                // they get reflected into the Advanced tab.
+                                var widthInput = this.getContentElement( 'info', 'width' ),
+                                        heightInput = this.getContentElement( 'info', 'height' );
+                                widthInput && widthInput.onChange();
+                                heightInput && heightInput.onChange();
                         },
                         onOk : function()
@@ -140 +167 @@
                                                                                 if ( this.getValue() )
                                                                                         extraStyles.width = this.getValue() + 'px';
+                                                                        },
+                                                                        onChange : function()
+                                                                        {
+                                                                                var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ),
+                                                                                        value = this.getValue();
+                                                                                styles && styles.updateStyle( 'width', value &&  ( value + 'px' ) );
                                                                         }
                                                                 },
@@ -164 +197 @@
                                                                                 if ( this.getValue() )
                                                                                         extraStyles.height = this.getValue() + 'px';
+                                                                        },
+                                                                        onChange : function()
+                                                                        {
+                                                                                var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ),
+                                                                                        value = this.getValue();
+                                                                                styles && styles.updateStyle( 'height', value &&  ( value + 'px' ) );
                                                                         }
                                                                 },