From 713761c876f650a495f04995d87281b5aeec998f Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 11 Dec 2008 02:45:42 +0000 Subject: Dialog: Partial fix for #3648: Use new CSS framework. --- ui/ui.dialog.js | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'ui') diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js index 2e6b8af3c..6c86249d6 100644 --- a/ui/ui.dialog.js +++ b/ui/ui.dialog.js @@ -38,7 +38,9 @@ $.widget("ui.dialog", { uiDialogContent = this.element .removeAttr('title') - .addClass('ui-dialog-content') + .addClass( + 'ui-dialog-content ' + + 'ui-widget-content') .wrap('
') .wrap('
'), @@ -51,18 +53,30 @@ $.widget("ui.dialog", { }), uiDialogTitlebar = (this.uiDialogTitlebar = $('
')) - .addClass('ui-dialog-titlebar') + .addClass( + 'ui-dialog-titlebar ' + + 'ui-widget-header ' + + 'ui-corner-all ' + + 'ui-helper-clearfix' + ) .mousedown(function() { self.moveToTop(); }) .prependTo(uiDialogContainer), uiDialogTitlebarClose = $('') - .addClass('ui-dialog-titlebar-close') + .addClass( + 'ui-dialog-titlebar-close ' + + 'ui-corner-all' + ) .attr('role', 'button') .appendTo(uiDialogTitlebar), uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('')) + .addClass( + 'ui-icon ' + + 'ui-icon-closethick' + ) .text(options.closeText) .appendTo(uiDialogTitlebarClose), @@ -77,7 +91,12 @@ $.widget("ui.dialog", { uiDialog = (this.uiDialog = uiDialogContainer.parent()) .appendTo(document.body) .hide() - .addClass('ui-dialog') + .addClass( + 'ui-dialog ' + + 'ui-widget ' + + 'ui-widget-content ' + + 'ui-corner-all' + ) .addClass(options.dialogClass) .css({ position: 'absolute', @@ -101,7 +120,11 @@ $.widget("ui.dialog", { }), uiDialogButtonPane = (this.uiDialogButtonPane = $('
')) - .addClass('ui-dialog-buttonpane') + .addClass( + 'ui-dialog-buttonpane ' + + 'ui-widget-content ' + + 'ui-helper-clearfix' + ) .css({ position: 'absolute', bottom: 0 @@ -242,6 +265,10 @@ $.widget("ui.dialog", { uiDialogButtonPane.show(); $.each(buttons, function(name, fn) { $('') + .addClass( + 'ui-state-default ' + + 'ui-corner-all' + ) .text(name) .click(function() { fn.apply(self.element[0], arguments); }) .appendTo(uiDialogButtonPane); -- cgit v1.2.3