Changeset 6942 for CKEditor/trunk

Timestamp:

05/19/11 18:18:34 (2 years ago)

Author:

garry.yao

Message:

#7323: Fixing dialog field centre alignment on IE quirks.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (2 diffs)
• _source/plugins/dialog/dialogDefinition.js (modified) (1 diff)
• _source/plugins/dialog/plugin.js (modified) (3 diffs)
• _source/plugins/liststyle/dialogs/liststyle.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -41 +41 @@
         <ul>
                 <li><a href="http://dev.ckeditor.com/ticket/6492">#6492</a> : Find/replace dialog now will be populated with editor's selected text.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7323">#7323</a> : New <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.dialog.definition.uiElement.html#align">align</a> property on dialog UI element for field alignment.</li>
         </ul>
         <p>
@@ -63 +64 @@
                 <li><a href="http://dev.ckeditor.com/ticket/7860">#7860</a> : The BBCode plugin was stripping BBCode tags that are not implemented in the plugin, as from now they will be handled as a simple text.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7321">#7321</a> : [IE6] Contents inside RTL fields in dialog windows were overflowing.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/7323">#7323</a> : [IE Quirks] Some dialog fields are not centre aligned.</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/dialog/dialogDefinition.js

@@ -259 +259 @@
  * Inline CSS classes to append to the UI element.
  * @name CKEDITOR.dialog.definition.uiElement.prototype.style
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Horizontal alignment (in container) of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.align
  * @field
  * @type String

CKEditor/trunk/_source/plugins/dialog/plugin.js

@@ -2262 +2262 @@
                                 // Write the inline CSS styles.
                                 var styleStr = ( elementDefinition.style || '' ).split( ';' );
+
+                                // Element alignment support.
+                                if ( elementDefinition.align )
+                                {
+                                        var align = elementDefinition.align;
+                                        styles[ 'margin-left' ] = align == 'left' ? 0 : 'auto';
+                                        styles[ 'margin-right' ] = align == 'right' ? 0 : 'auto';
+                                }
+
                                 for ( i in styles )
                                         styleStr.push( i + ':' + styles[i] );
@@ -2392 +2401 @@
                                                 if ( elementDefinition && elementDefinition.padding != undefined )
                                                         styles.push( 'padding:' + cssLength( elementDefinition.padding ) );
+                                                // In IE Quirks alignment has to be done on table cells. (#7324)
+                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align )
+                                                        styles.push( 'text-align:' + children[ i ].align );
                                                 if ( styles.length > 0 )
                                                         html.push( 'style="' + styles.join('; ') + '" ' );
@@ -2477 +2489 @@
                                                 if ( elementDefinition && elementDefinition.padding != undefined )
                                                         styles.push( 'padding:' + cssLength( elementDefinition.padding ) );
+                                                // In IE Quirks alignment has to be done on table cells. (#7324)
+                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align )
+                                                        styles.push( 'text-align:' + children[ i ].align );
                                                 if ( styles.length > 0 )
                                                         html.push( 'style="', styles.join( '; ' ), '" ' );

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

@@ -47 +47 @@
                                                                 label : lang.type,
                                                                 id : 'type',
-                                                                style : 'width: 150px; margin: auto;',
+                                                                align : 'center',
+                                                                style : 'width:150px',
                                                                 items :
                                                                 [