library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog: Extract button pane creation into _createButtonPane

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/visual/dialog/complex-dialogs.html
View File

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

26
ui/jquery.ui.dialog.js vendored
View File

@ -123,16 +123,8 @@ $.widget("ui.dialog", {
.addClass( "ui-dialog-content ui-widget-content" ) .addClass( "ui-dialog-content ui-widget-content" )
.appendTo( this.uiDialog ); .appendTo( this.uiDialog );
this._createTitlebar(); this._createTitlebar();
this._createButtonPane();
// 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 );
// TODO move into _createWrapper // TODO move into _createWrapper
// We assume that any existing aria-describedby attribute means // We assume that any existing aria-describedby attribute means
@ -151,9 +143,6 @@ $.widget("ui.dialog", {
this._makeResizable(); this._makeResizable();
} }
// TODO merge with _createButtonPane?
this._createButtons();
this._isOpen = false; this._isOpen = false;
// prevent tabbing out of dialogs // 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() { _createButtons: function() {
var that = this, var that = this,
buttons = this.options.buttons; buttons = this.options.buttons;