Index: CKEditor/trunk/CHANGES.html
===================================================================
--- CKEditor/trunk/CHANGES.html (revision 6941)
+++ CKEditor/trunk/CHANGES.html (revision 6942)
@@ -41,4 +41,5 @@
- #6492 : Find/replace dialog now will be populated with editor's selected text.
+ - #7323 : New align property on dialog UI element for field alignment.
@@ -63,4 +64,5 @@
#7860 : 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.
#7321 : [IE6] Contents inside RTL fields in dialog windows were overflowing.
+ #7323 : [IE Quirks] Some dialog fields are not centre aligned.
Updated the following language files:
- #7834 : Dutch;
Index: CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js
===================================================================
--- CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js (revision 6941)
+++ CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js (revision 6942)
@@ -259,4 +259,12 @@
* 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
Index: CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 6941)
+++ CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 6942)
@@ -2262,4 +2262,13 @@
// 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,4 +2401,7 @@
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,4 +2489,7 @@
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( '; ' ), '" ' );
Index: CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js
===================================================================
--- CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js (revision 6941)
+++ CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js (revision 6942)
@@ -47,5 +47,6 @@
label : lang.type,
id : 'type',
- style : 'width: 150px; margin: auto;',
+ align : 'center',
+ style : 'width:150px',
items :
[