Skip to content
Permalink
Browse files

Dialog: Extract button pane creation into _createButtonPane

  • Loading branch information...
jzaefferer committed Nov 15, 2012
1 parent 1d6ce64 commit 4c9caa816906d53b989c65bd24c56147517eee82
Showing with 22 additions and 14 deletions.
  1. +9 −1 tests/visual/dialog/complex-dialogs.html
  2. +13 −13 ui/jquery.ui.dialog.js
@@ -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({
@@ -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;

0 comments on commit 4c9caa8

Please sign in to comment.
You can’t perform that action at this time.