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: Update code style, adding whitespace around string arguments and array indices

Browse Source
This commit is contained in:
Jörn Zaefferer 2013-11-15 16:48:31 +01:00
parent 3945a8f074
commit 9fd0e86820
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,25 +86,25 @@ $.widget( "ui.dialog", {
_create: function() { _create: function() {
this.originalCss = { this.originalCss = {
display: this.element[0].style.display, display: this.element[ 0 ].style.display,
width: this.element[0].style.width, width: this.element[ 0 ].style.width,
minHeight: this.element[0].style.minHeight, minHeight: this.element[ 0 ].style.minHeight,
maxHeight: this.element[0].style.maxHeight, maxHeight: this.element[ 0 ].style.maxHeight,
height: this.element[0].style.height height: this.element[ 0 ].style.height
}; };
this.originalPosition = { this.originalPosition = {
parent: this.element.parent(), parent: this.element.parent(),
index: this.element.parent().children().index( this.element ) index: this.element.parent().children().index( this.element )
}; };
this.originalTitle = this.element.attr("title"); this.originalTitle = this.element.attr( "title" );
this.options.title = this.options.title || this.originalTitle; this.options.title = this.options.title || this.originalTitle;
this._createWrapper(); this._createWrapper();
this.element this.element
.show() .show()
.removeAttr("title") .removeAttr( "title" )
.addClass("ui-dialog-content ui-widget-content") .addClass( "ui-dialog-content ui-widget-content" )
.appendTo( this.uiDialog ); .appendTo( this.uiDialog );
this._createTitlebar(); this._createTitlebar();
@ -144,7 +144,7 @@ $.widget( "ui.dialog", {
this.element this.element
.removeUniqueId() .removeUniqueId()
.removeClass("ui-dialog-content ui-widget-content") .removeClass( "ui-dialog-content ui-widget-content" )
.css( this.originalCss ) .css( this.originalCss )
// Without detaching first, the following becomes really slow // Without detaching first, the following becomes really slow
.detach(); .detach();
@ -157,7 +157,7 @@ $.widget( "ui.dialog", {
next = originalPosition.parent.children().eq( originalPosition.index ); next = originalPosition.parent.children().eq( originalPosition.index );
// Don't try to place the dialog next to itself (#8613) // Don't try to place the dialog next to itself (#8613)
if ( next.length && next[0] !== this.element[0] ) { if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
next.before( this.element ); next.before( this.element );
} else { } else {
originalPosition.parent.append( this.element ); originalPosition.parent.append( this.element );
@ -183,7 +183,7 @@ $.widget( "ui.dialog", {
this._focusedElement = null; this._focusedElement = null;
this._destroyOverlay(); this._destroyOverlay();
if ( !this.opener.filter(":focusable").focus().length ) { if ( !this.opener.filter( ":focusable" ).focus().length ) {
// support: IE9 // support: IE9
// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe> // IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
@ -243,7 +243,7 @@ $.widget( "ui.dialog", {
} }
this._isOpen = true; this._isOpen = true;
this.opener = $( this.document[0].activeElement ); this.opener = $( this.document[ 0 ].activeElement );
this._size(); this._size();
this._position(); this._position();
@ -251,10 +251,10 @@ $.widget( "ui.dialog", {
this._moveToTop( null, true ); this._moveToTop( null, true );
this._show( this.uiDialog, this.options.show, function() { this._show( this.uiDialog, this.options.show, function() {
that._focusTabbable(); that._focusTabbable();
that._trigger("focus"); that._trigger( "focus" );
}); });
this._trigger("open"); this._trigger( "open" );
}, },
_focusTabbable: function() { _focusTabbable: function() {
@ -326,9 +326,9 @@ $.widget( "ui.dialog", {
if ( event.keyCode !== $.ui.keyCode.TAB ) { if ( event.keyCode !== $.ui.keyCode.TAB ) {
return; return;
} }
var tabbables = this.uiDialog.find(":tabbable"), var tabbables = this.uiDialog.find( ":tabbable" ),
first = tabbables.filter(":first"), first = tabbables.filter( ":first" ),
last = tabbables.filter(":last"); last = tabbables.filter( ":last" );
if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) { if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
first.focus( 1 ); first.focus( 1 );
@ -348,9 +348,9 @@ $.widget( "ui.dialog", {
// We assume that any existing aria-describedby attribute means // We assume that any existing aria-describedby attribute means
// that the dialog content is marked up properly // that the dialog content is marked up properly
// otherwise we brute force the content as the description // otherwise we brute force the content as the description
if ( !this.element.find("[aria-describedby]").length ) { if ( !this.element.find( "[aria-describedby]" ).length ) {
this.uiDialog.attr({ this.uiDialog.attr({
"aria-describedby": this.element.uniqueId().attr("id") "aria-describedby": this.element.uniqueId().attr( "id" )
}); });
} }
}, },
@ -358,15 +358,15 @@ $.widget( "ui.dialog", {
_createTitlebar: function() { _createTitlebar: function() {
var uiDialogTitle; var uiDialogTitle;
this.uiDialogTitlebar = $("<div>") this.uiDialogTitlebar = $( "<div>" )
.addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix") .addClass( "ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix" )
.prependTo( this.uiDialog ); .prependTo( this.uiDialog );
this._on( this.uiDialogTitlebar, { this._on( this.uiDialogTitlebar, {
mousedown: function( event ) { mousedown: function( event ) {
// Don't prevent click on close button (#8838) // Don't prevent click on close button (#8838)
// Focusing a dialog that is partially scrolled out of view // Focusing a dialog that is partially scrolled out of view
// causes the browser to scroll it into view, preventing the click event // causes the browser to scroll it into view, preventing the click event
if ( !$( event.target ).closest(".ui-dialog-titlebar-close") ) { if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) {
// Dialog isn't getting focus when dragging (#8063) // Dialog isn't getting focus when dragging (#8063)
this.uiDialog.focus(); this.uiDialog.focus();
} }
@ -384,7 +384,7 @@ $.widget( "ui.dialog", {
}, },
text: false text: false
}) })
.addClass("ui-dialog-titlebar-close") .addClass( "ui-dialog-titlebar-close" )
.appendTo( this.uiDialogTitlebar ); .appendTo( this.uiDialogTitlebar );
this._on( this.uiDialogTitlebarClose, { this._on( this.uiDialogTitlebarClose, {
click: function( event ) { click: function( event ) {
@ -393,30 +393,30 @@ $.widget( "ui.dialog", {
} }
}); });
uiDialogTitle = $("<span>") uiDialogTitle = $( "<span>" )
.uniqueId() .uniqueId()
.addClass("ui-dialog-title") .addClass( "ui-dialog-title" )
.prependTo( this.uiDialogTitlebar ); .prependTo( this.uiDialogTitlebar );
this._title( uiDialogTitle ); this._title( uiDialogTitle );
this.uiDialog.attr({ this.uiDialog.attr({
"aria-labelledby": uiDialogTitle.attr("id") "aria-labelledby": uiDialogTitle.attr( "id" )
}); });
}, },
_title: function( title ) { _title: function( title ) {
if ( !this.options.title ) { if ( !this.options.title ) {
title.html("&#160;"); title.html( "&#160;" );
} }
title.text( this.options.title ); title.text( this.options.title );
}, },
_createButtonPane: function() { _createButtonPane: function() {
this.uiDialogButtonPane = $("<div>") this.uiDialogButtonPane = $( "<div>" )
.addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"); .addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" );
this.uiButtonSet = $("<div>") this.uiButtonSet = $( "<div>" )
.addClass("ui-dialog-buttonset") .addClass( "ui-dialog-buttonset" )
.appendTo( this.uiDialogButtonPane ); .appendTo( this.uiDialogButtonPane );
this._createButtons(); this._createButtons();
@ -431,7 +431,7 @@ $.widget( "ui.dialog", {
this.uiButtonSet.empty(); this.uiButtonSet.empty();
if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) { if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) {
this.uiDialog.removeClass("ui-dialog-buttons"); this.uiDialog.removeClass( "ui-dialog-buttons" );
return; return;
} }
@ -445,7 +445,7 @@ $.widget( "ui.dialog", {
// Change the context for the click callback to be the main element // Change the context for the click callback to be the main element
click = props.click; click = props.click;
props.click = function() { props.click = function() {
click.apply( that.element[0], arguments ); click.apply( that.element[ 0 ], arguments );
}; };
buttonOptions = { buttonOptions = {
icons: props.icons, icons: props.icons,
@ -457,7 +457,7 @@ $.widget( "ui.dialog", {
.button( buttonOptions ) .button( buttonOptions )
.appendTo( that.uiButtonSet ); .appendTo( that.uiButtonSet );
}); });
this.uiDialog.addClass("ui-dialog-buttons"); this.uiDialog.addClass( "ui-dialog-buttons" );
this.uiDialogButtonPane.appendTo( this.uiDialog ); this.uiDialogButtonPane.appendTo( this.uiDialog );
}, },
@ -477,7 +477,7 @@ $.widget( "ui.dialog", {
handle: ".ui-dialog-titlebar", handle: ".ui-dialog-titlebar",
containment: "document", containment: "document",
start: function( event, ui ) { start: function( event, ui ) {
$( this ).addClass("ui-dialog-dragging"); $( this ).addClass( "ui-dialog-dragging" );
that._blockFrames(); that._blockFrames();
that._trigger( "dragStart", event, filteredUi( ui ) ); that._trigger( "dragStart", event, filteredUi( ui ) );
}, },
@ -494,7 +494,7 @@ $.widget( "ui.dialog", {
"top" + (top >= 0 ? "+" : "") + top, "top" + (top >= 0 ? "+" : "") + top,
of: that.window of: that.window
}; };
$( this ).removeClass("ui-dialog-dragging"); $( this ).removeClass( "ui-dialog-dragging" );
that._unblockFrames(); that._unblockFrames();
that._trigger( "dragStop", event, filteredUi( ui ) ); that._trigger( "dragStop", event, filteredUi( ui ) );
} }
@ -531,7 +531,7 @@ $.widget( "ui.dialog", {
minHeight: this._minHeight(), minHeight: this._minHeight(),
handles: resizeHandles, handles: resizeHandles,
start: function( event, ui ) { start: function( event, ui ) {
$( this ).addClass("ui-dialog-resizing"); $( this ).addClass( "ui-dialog-resizing" );
that._blockFrames(); that._blockFrames();
that._trigger( "resizeStart", event, filteredUi( ui ) ); that._trigger( "resizeStart", event, filteredUi( ui ) );
}, },
@ -551,7 +551,7 @@ $.widget( "ui.dialog", {
"top" + (top >= 0 ? "+" : "") + top, "top" + (top >= 0 ? "+" : "") + top,
of: that.window of: that.window
}; };
$( this ).removeClass("ui-dialog-resizing"); $( this ).removeClass( "ui-dialog-resizing" );
that._unblockFrames(); that._unblockFrames();
that._trigger( "resizeStop", event, filteredUi( ui ) ); that._trigger( "resizeStop", event, filteredUi( ui ) );
} }
@ -577,7 +577,7 @@ $.widget( "ui.dialog", {
_position: function() { _position: function() {
// Need to show the dialog to get the actual offset in the position plugin // Need to show the dialog to get the actual offset in the position plugin
var isVisible = this.uiDialog.is(":visible"); var isVisible = this.uiDialog.is( ":visible" );
if ( !isVisible ) { if ( !isVisible ) {
this.uiDialog.show(); this.uiDialog.show();
} }
@ -607,7 +607,7 @@ $.widget( "ui.dialog", {
this._size(); this._size();
this._position(); this._position();
} }
if ( this.uiDialog.is(":data(ui-resizable)") ) { if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
this.uiDialog.resizable( "option", resizableOptions ); this.uiDialog.resizable( "option", resizableOptions );
} }
}, },
@ -644,9 +644,9 @@ $.widget( "ui.dialog", {
} }
if ( key === "draggable" ) { if ( key === "draggable" ) {
isDraggable = uiDialog.is(":data(ui-draggable)"); isDraggable = uiDialog.is( ":data(ui-draggable)" );
if ( isDraggable && !value ) { if ( isDraggable && !value ) {
uiDialog.draggable("destroy"); uiDialog.draggable( "destroy" );
} }
if ( !isDraggable && value ) { if ( !isDraggable && value ) {
@ -660,9 +660,9 @@ $.widget( "ui.dialog", {
if ( key === "resizable" ) { if ( key === "resizable" ) {
// currently resizable, becoming non-resizable // currently resizable, becoming non-resizable
isResizable = uiDialog.is(":data(ui-resizable)"); isResizable = uiDialog.is( ":data(ui-resizable)" );
if ( isResizable && !value ) { if ( isResizable && !value ) {
uiDialog.resizable("destroy"); uiDialog.resizable( "destroy" );
} }
// currently resizable, changing handles // currently resizable, changing handles
@ -677,7 +677,7 @@ $.widget( "ui.dialog", {
} }
if ( key === "title" ) { if ( key === "title" ) {
this._title( this.uiDialogTitlebar.find(".ui-dialog-title") ); this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
} }
}, },
@ -721,7 +721,7 @@ $.widget( "ui.dialog", {
this.element.height( Math.max( 0, options.height - nonContentHeight ) ); this.element.height( Math.max( 0, options.height - nonContentHeight ) );
} }
if (this.uiDialog.is(":data(ui-resizable)") ) { if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
this.uiDialog.resizable( "option", "minHeight", this._minHeight() ); this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
} }
}, },
@ -749,13 +749,13 @@ $.widget( "ui.dialog", {
}, },
_allowInteraction: function( event ) { _allowInteraction: function( event ) {
if ( $( event.target ).closest(".ui-dialog").length ) { if ( $( event.target ).closest( ".ui-dialog" ).length ) {
return true; return true;
} }
// TODO: Remove hack when datepicker implements // TODO: Remove hack when datepicker implements
// the .ui-front logic (#8989) // the .ui-front logic (#8989)
return !!$( event.target ).closest(".ui-datepicker").length; return !!$( event.target ).closest( ".ui-datepicker" ).length;
}, },
_createOverlay: function() { _createOverlay: function() {
@ -790,8 +790,8 @@ $.widget( "ui.dialog", {
}); });
} }
this.overlay = $("<div>") this.overlay = $( "<div>" )
.addClass("ui-widget-overlay ui-front") .addClass( "ui-widget-overlay ui-front" )
.appendTo( this._appendTo() ); .appendTo( this._appendTo() );
this._on( this.overlay, { this._on( this.overlay, {
mousedown: "_keepFocus" mousedown: "_keepFocus"
@ -822,4 +822,4 @@ $.widget( "ui.dialog", {
} }
}); });
}( jQuery ) ); }( jQuery ));