vanilla ckeditor-3.6.1

[ckeditor.git] / _source / plugins / dialogui / plugin.js

diff --git a/_source/plugins/dialogui/plugin.js b/_source/plugins/dialogui/plugin.js
index 319af7c..c68c35b 100644 (file)
--- a/_source/plugins/dialogui/plugin.js
+++ b/_source/plugins/dialogui/plugin.js
@@ -158,10 +158,10 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                html.push( '<label class="cke_dialog_ui_labeled_label' + requiredClass + '" ',\r
                                                                ' id="'+  _.labelId + '"',\r
                                                                ' for="' + _.inputId + '"',\r
-                                                               ' style="' + elementDefinition.labelStyle + '">',\r
+                                                               ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) +'>',\r
                                                                elementDefinition.label,\r
                                                                '</label>',\r
-                                                               '<div class="cke_dialog_ui_labeled_content" role="presentation">',\r
+                                                               '<div class="cke_dialog_ui_labeled_content"' + ( elementDefinition.controlStyle ? ' style="' + elementDefinition.controlStyle + '"' : '' ) + ' role="presentation">',\r
                                                                contentHtml.call( this, dialog, elementDefinition ),\r
                                                                '</div>' );\r
                                        else\r
@@ -177,13 +177,13 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                                        html : '<label class="cke_dialog_ui_labeled_label' + requiredClass + '"' +\r
                                                                                ' id="' + _.labelId + '"' +\r
                                                                                ' for="' + _.inputId + '"' +\r
-                                                                               ' style="' + elementDefinition.labelStyle + '">' +\r
+                                                                               ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) +'>' +\r
                                                                                   CKEDITOR.tools.htmlEncode( elementDefinition.label ) +\r
                                                                                '</span>'\r
                                                                },\r
                                                                {\r
                                                                        type : 'html',\r
-                                                                       html : '<span class="cke_dialog_ui_labeled_content">' +\r
+                                                                       html : '<span class="cke_dialog_ui_labeled_content"' + ( elementDefinition.controlStyle ? ' style="' + elementDefinition.controlStyle + '"' : '' ) + '>' +\r
                                                                                contentHtml.call( this, dialog, elementDefinition ) +\r
                                                                                '</span>'\r
                                                                }\r
@@ -237,8 +237,8 @@ CKEDITOR.plugins.add( 'dialogui' );
                                if ( elementDefinition.size )\r
                                        attributes.size = elementDefinition.size;\r
 \r
-                               if ( elementDefinition.controlStyle )\r
-                                       attributes.style = elementDefinition.controlStyle;\r
+                               if ( elementDefinition.inputStyle )\r
+                                       attributes.style = elementDefinition.inputStyle;\r
 \r
                                // If user presses Enter in a text box, it implies clicking OK for the dialog.\r
                                var me = this, keyPressedOnMe = false;\r
@@ -323,6 +323,10 @@ CKEDITOR.plugins.add( 'dialogui' );
                                attributes.rows = elementDefinition.rows || 5;\r
                                attributes.cols = elementDefinition.cols || 20;\r
 \r
+                               if ( typeof elementDefinition.inputStyle != 'undefined' )\r
+                                       attributes.style = elementDefinition.inputStyle;\r
+\r
+\r
                                /** @ignore */\r
                                var innerHTML = function()\r
                                {\r
@@ -380,11 +384,11 @@ CKEDITOR.plugins.add( 'dialogui' );
                                        if ( elementDefinition[ 'default' ] )\r
                                                attributes.checked = 'checked';\r
 \r
-                                       if ( typeof myDefinition.controlStyle != 'undefined' )\r
-                                               myDefinition.style = myDefinition.controlStyle;\r
+                                       if ( typeof myDefinition.inputStyle != 'undefined' )\r
+                                               myDefinition.style = myDefinition.inputStyle;\r
 \r
                                        _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes );\r
-                                       html.push( ' <label id="', labelId, '" for="', attributes.id, '">',\r
+                                       html.push( ' <label id="', labelId, '" for="', attributes.id, '"' + ( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) + '>',\r
                                                        CKEDITOR.tools.htmlEncode( elementDefinition.label ),\r
                                                        '</label>' );\r
                                        return html.join( '' );\r
@@ -462,8 +466,8 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                cleanInnerDefinition( inputDefinition );\r
                                                cleanInnerDefinition( labelDefinition );\r
 \r
-                                               if ( typeof inputDefinition.controlStyle != 'undefined' )\r
-                                                       inputDefinition.style = inputDefinition.controlStyle;\r
+                                               if ( typeof inputDefinition.inputStyle != 'undefined' )\r
+                                                       inputDefinition.style = inputDefinition.inputStyle;\r
 \r
                                                children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );\r
                                                inputHtml.push( ' ' );\r
@@ -622,8 +626,8 @@ CKEDITOR.plugins.add( 'dialogui' );
                                                        CKEDITOR.tools.htmlEncode( item[0] ) );\r
                                        }\r
 \r
-                                       if ( typeof myDefinition.controlStyle != 'undefined' )\r
-                                               myDefinition.style = myDefinition.controlStyle;\r
+                                       if ( typeof myDefinition.inputStyle != 'undefined' )\r
+                                               myDefinition.style = myDefinition.inputStyle;\r
 \r
                                        _.select = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'select', null, attributes, innerHTML.join( '' ) );\r
                                        return html.join( '' );\r