Dialog: Extract button pane creation into _createButtonPane

This commit is contained in:
Jörn Zaefferer 2012-11-15 23:23:25 +01:00
parent 1d6ce644e0
commit 4c9caa8169
2 changed files with 22 additions and 14 deletions

View File

@ -25,7 +25,15 @@
var dialog = $( "#dialog" ).dialog({
modal: true,
height: 300,
width: 500
width: 500,
buttons: [
{
text: "Ok"
},
{
text: "Cancel"
}
]
}),
datepickerDialog = $( "#dialog-datepicker" ).dialog({

View File

@ -123,16 +123,8 @@ $.widget("ui.dialog", {
.addClass( "ui-dialog-content ui-widget-content" )
.appendTo( this.uiDialog );
this._createTitlebar();
// TODO extract this one and the next into a _createButtonPane method
uiDialogButtonPane = ( this.uiDialogButtonPane = $( "<div>" ) )
.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
( this.uiButtonSet = $( "<div>" ) )
.addClass( "ui-dialog-buttonset" )
.appendTo( uiDialogButtonPane );
this._createTitlebar();
this._createButtonPane();
// TODO move into _createWrapper
// We assume that any existing aria-describedby attribute means
@ -151,9 +143,6 @@ $.widget("ui.dialog", {
this._makeResizable();
}
// TODO merge with _createButtonPane?
this._createButtons();
this._isOpen = false;
// prevent tabbing out of dialogs
@ -365,6 +354,17 @@ $.widget("ui.dialog", {
});
},
_createButtonPane: function() {
var uiDialogButtonPane = ( this.uiDialogButtonPane = $( "<div>" ) )
.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
this.uiButtonSet = $( "<div>" )
.addClass( "ui-dialog-buttonset" )
.appendTo( uiDialogButtonPane );
this._createButtons();
},
_createButtons: function() {
var that = this,
buttons = this.options.buttons;