Changeset 5685

Timestamp:

07/09/10 18:26:22 (3 years ago)

Author:

alfonsoml

Message:

#5927 Use .controlStyle in the definition of an ui.dialog.element to set specific inline styles.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (2 diffs)
• _source/plugins/dialogui/plugin.js (modified) (4 diffs)

CKEditor/trunk/CHANGES.html

@@ -40 +40 @@
                         New features:</p>
         <ul>
-                        <li></li>
+                <li><a href="http://dev.fckeditor.net/ticket/5882">#5882</a> : New event dialog#selectPage like the OnDialogTabChange in FCKeditor.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/5927">#5927</a> : The native controls in ui.dialog elements can be styled with a controlStyle definition.</li>
         </ul>
         <p>
@@ -65 +66 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4997">#4997</a> : Provide better access to the native input in the ui.dialog.file element.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/5914">#5914</a> : Modified the Smilies dialog to make active only the images and not their borders.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/5882">#5882</a> : New event dialog#selectPage like the OnDialogTabChange in FCKeditor.</li>
         </ul>
         <h3>

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

@@ -237 +237 @@
                                         attributes.size = elementDefinition.size;
 
+                                if ( elementDefinition.controlStyle )
+                                        attributes.style = elementDefinition.controlStyle;
+
                                 // If user presses Enter in a text box, it implies clicking OK for the dialog.
                                 var me = this, keyPressedOnMe = false;
@@ -376 +379 @@
                                         if ( elementDefinition[ 'default' ] )
                                                 attributes.checked = 'checked';
+
+                                        if (typeof myDefinition.controlStyle != 'undefined')
+                                                myDefinition.style = myDefinition.controlStyle;
+
                                         _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes );
                                         html.push( ' <label id="', labelId, '" for="', attributes.id, '">',
@@ -454 +461 @@
                                                 cleanInnerDefinition( inputDefinition );
                                                 cleanInnerDefinition( labelDefinition );
+
+                                                if (typeof inputDefinition.controlStyle != 'undefined')
+                                                        inputDefinition.style = inputDefinition.controlStyle;
+
                                                 children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );
                                                 inputHtml.push( ' ' );
@@ -611 +622 @@
                                         }
 
+                                        if (typeof myDefinition.controlStyle != 'undefined')
+                                                myDefinition.style = myDefinition.controlStyle;
+
                                         _.select = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'select', null, attributes, innerHTML.join( '' ) );
                                         return html.join( '' );