library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: remove unneeded DOM manipulations. Fixed #7258 - optimize initialization.

Browse Source
This commit is contained in:
Adam Baratz 2011-05-02 18:03:14 -04:00 committed by Scott González
parent 3d5d58d854
commit 51df02ee4e
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,16 +86,14 @@ $.widget("ui.dialog", {
titleId = $.ui.dialog.getTitleId( self.element ), titleId = $.ui.dialog.getTitleId( self.element ),
uiDialog = ( self.uiDialog = $( "<div>" ) ) uiDialog = ( self.uiDialog = $( "<div>" ) )
.appendTo( document.body )
.hide()
.addClass( uiDialogClasses + options.dialogClass ) .addClass( uiDialogClasses + options.dialogClass )
.css({ .css({
display: "none",
outline: 0, // TODO: move to stylesheet
zIndex: options.zIndex zIndex: options.zIndex
}) })
// setting tabIndex makes the div focusable // setting tabIndex makes the div focusable
.attr( "tabIndex", -1) .attr( "tabIndex", -1)
// TODO: move to stylesheet
.css( "outline", 0 )
.keydown(function( event ) { .keydown(function( event ) {
if ( options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode && if ( options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
event.keyCode === $.ui.keyCode.ESCAPE ) { event.keyCode === $.ui.keyCode.ESCAPE ) {
@ -156,6 +154,8 @@ $.widget("ui.dialog", {
self._createButtons( options.buttons ); self._createButtons( options.buttons );
self._isOpen = false; self._isOpen = false;
uiDialog.appendTo( document.body );
if ( $.fn.bgiframe ) { if ( $.fn.bgiframe ) {
uiDialog.bgiframe(); uiDialog.bgiframe();
} }
@ -310,9 +310,14 @@ $.widget("ui.dialog", {
// set focus to the first tabbable element in the content area or the first button // set focus to the first tabbable element in the content area or the first button
// if there are no tabbable elements, set focus on the dialog itself // if there are no tabbable elements, set focus on the dialog itself
$( self.element.find( ":tabbable" ).get().concat( var hasFocus = self.element.find( ":tabbable" );
uiDialog.find( ".ui-dialog-buttonpane :tabbable" ).get().concat( if ( !hasFocus.length ) {
uiDialog.get() ) ) ).eq( 0 ).focus(); hasFocus = uiDialog.find( ".ui-dialog-buttonpane :tabbable" );
if ( !hasFocus.length ) {
hasFocus = uiDialog;
}
}
hasFocus.eq( 0 ).focus();
self._isOpen = true; self._isOpen = true;
self._trigger( "open" ); self._trigger( "open" );
@ -322,12 +327,7 @@ $.widget("ui.dialog", {
_createButtons: function( buttons ) { _createButtons: function( buttons ) {
var self = this, var self = this,
hasButtons = false, hasButtons = false;
uiDialogButtonPane = $( "<div>" )
.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ),
uiButtonSet = $( "<div>" )
.addClass( "ui-dialog-buttonset" )
.appendTo( uiDialogButtonPane );
// if we already have a button pane, remove it // if we already have a button pane, remove it
self.uiDialog.find( ".ui-dialog-buttonpane" ).remove(); self.uiDialog.find( ".ui-dialog-buttonpane" ).remove();
@ -338,6 +338,12 @@ $.widget("ui.dialog", {
}); });
} }
if ( hasButtons ) { if ( hasButtons ) {
var uiDialogButtonPane = $( "<div>" )
.addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ),
uiButtonSet = $( "<div>" )
.addClass( "ui-dialog-buttonset" )
.appendTo( uiDialogButtonPane );
$.each( buttons, function( name, props ) { $.each( buttons, function( name, props ) {
props = $.isFunction( props ) ? props = $.isFunction( props ) ?
{ click: props, text: name } : { click: props, text: name } :