Ticket #6835: 6835_ref.patch

_source/plugins/dialog/plugin.js

@@ -942 +942 @@
                                                         children : contents.elements,
                                                         expand : !!contents.expand,
                                                         padding : contents.padding,
-                                                        style : contents.style || 'width: 100%;'
+                                                        style : contents.style || 'width: 100%;height:100%'
                                                 }, pageHtml );
 
                         // Create the HTML for the tab and the content block.
@@ -2255 +2255 @@
                                 var children = this._.children = childObjList,
                                         widths = elementDefinition && elementDefinition.widths || null,
                                         height = elementDefinition && elementDefinition.height || null,
-                                        styles = {},
+                                        styles = { height: '100%' },
                                         i;
                                 /** @ignore */
                                 var innerHTML = function()
@@ -2340 +2340 @@
 
                                 var children = this._.children = childObjList,
                                         width = elementDefinition && elementDefinition.width || null,
-                                        heights = elementDefinition && elementDefinition.heights || null;
+                                        heights = elementDefinition && elementDefinition.heights || null,
+                                        attributes = { cellspacing : 0, border : 0, role : 'presentation', align : CKEDITOR.tools.htmlEncode(
+                                                ( elementDefinition && elementDefinition.align ) || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) ) },
+                                        styles = { width : cssLength( width || '100%' ), height : ( elementDefinition && elementDefinition.expand !== false ) ? '100%' : '' };
+
                                 /** @ignore */
                                 var innerHTML = function()
                                 {
-                                        var html = [ '<table role="presentation" cellspacing="0" border="0" ' ];
-                                        html.push( 'style="' );
-                                        if ( elementDefinition && elementDefinition.expand )
-                                                html.push( 'height:100%;' );
-                                        html.push( 'width:' + cssLength( width || '100%' ), ';' );
-                                        html.push( '"' );
-                                        html.push( 'align="', CKEDITOR.tools.htmlEncode(
-                                                ( elementDefinition && elementDefinition.align ) || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) ), '" ' );
-
-                                        html.push( '><tbody>' );
+                                        var html = [ '<tbody>' ];
                                         for ( var i = 0 ; i < childHtmlList.length ; i++ )
                                         {
                                                 var styles = [];
@@ -2370 +2365 @@
                                                         html.push( 'style="', styles.join( '; ' ), '" ' );
                                                 html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '</td></tr>' );
                                         }
-                                        html.push( '</tbody></table>' );
+                                        html.push( '</tbody>' );
                                         return html.join( '' );
                                 };
-                                CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'vbox' }, htmlList, 'div', null, { role : 'presentation' }, innerHTML );
+                                CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'vbox' }, htmlList, 'table', styles, attributes, innerHTML );
                         }
                 };
         })();