Ticket #3876: 3876.patch

_source/plugins/dialogui/plugin.js

@@ -332 +332 @@
                                         if ( elementDefinition[ 'default' ] )
                                                 attributes.checked = 'checked';
                                         _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes );
-                                        html.push( ' ', CKEDITOR.tools.htmlEncode( elementDefinition.label ) );
+                                        html.push( '<label for="', attributes.id, '">',
+                                                        CKEDITOR.tools.htmlEncode( elementDefinition.label ),
+                                                        '</label>' );
                                         return html.join( '' );
                                 };
 
-                                CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'label', null, null, innerHTML );
+                                CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'span', null, null, innerHTML );
                         },
 
                         /**
@@ -393 +395 @@
                                                                                 id : null,
                                                                                 title : title
                                                                         }, true ),
-                                                        inputHtml = [],
                                                         inputAttributes =
                                                         {
                                                                 type : 'radio',
                                                                 'class' : 'cke_dialog_ui_radio_input',
                                                                 name : commonName,
                                                                 value : value
-                                                        };
+                                                        },
+                                                        inputHtml = [];
                                                 if ( me._['default'] == value )
                                                         inputAttributes.checked = 'checked';
                                                 cleanInnerDefinition( inputDefinition );
                                                 cleanInnerDefinition( labelDefinition );
                                                 children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );
-                                                new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtmlList, 'label', null, null,
-                                                           inputHtml.join( '' ) + ' ' + item[0] );
+                                                new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtml, 'label', null, { 'for' : inputAttributes.id },
+                                                           item[0] );
+                                                inputHtmlList.push( inputHtml.join( '' ) );
                                         }
                                         new CKEDITOR.ui.dialog.hbox( dialog, [], inputHtmlList, html );
                                         return html.join( '' );