Skip to content

Commit 3dd7ba7

Browse files
committed
Dialog: Finish refactoring _setOption, getting rid of unnecessary switch (no fallthroughs).
1 parent e6e9258 commit 3dd7ba7

File tree

1 file changed

+50
-47
lines changed

1 file changed

+50
-47
lines changed

ui/jquery.ui.dialog.js

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -578,57 +578,60 @@ $.widget("ui.dialog", {
578578
this._createButtons();
579579
}
580580

581-
switch ( key ) {
582-
case "closeText":
581+
if ( key === "closeText" ) {
582+
this.uiDialogTitlebarClose.button({
583583
// ensure that we always pass a string
584-
this.uiDialogTitlebarClose.button({
585-
label: "" + value
586-
});
587-
break;
588-
case "disabled":
589-
// TODO use toggleClass( "ui-dialog-disabled", value )
590-
if ( value ) {
591-
uiDialog.addClass( "ui-dialog-disabled" );
592-
} else {
593-
uiDialog.removeClass( "ui-dialog-disabled" );
594-
}
595-
break;
596-
case "draggable":
597-
isDraggable = uiDialog.is( ":data(ui-draggable)" );
598-
if ( isDraggable && !value ) {
599-
uiDialog.draggable( "destroy" );
600-
}
584+
label: "" + value
585+
});
586+
}
601587

602-
if ( !isDraggable && value ) {
603-
this._makeDraggable();
604-
}
605-
break;
606-
case "position":
607-
this._position( value );
608-
break;
609-
case "resizable":
610-
// currently resizable, becoming non-resizable
611-
isResizable = uiDialog.is( ":data(ui-resizable)" );
612-
if ( isResizable && !value ) {
613-
uiDialog.resizable( "destroy" );
614-
}
588+
if ( key === "disabled" ) {
589+
// TODO use toggleClass( "ui-dialog-disabled", value )
590+
if ( value ) {
591+
uiDialog.addClass( "ui-dialog-disabled" );
592+
} else {
593+
uiDialog.removeClass( "ui-dialog-disabled" );
594+
}
595+
}
615596

616-
// currently resizable, changing handles
617-
if ( isResizable && typeof value === "string" ) {
618-
uiDialog.resizable( "option", "handles", value );
619-
}
597+
if ( key === "draggable" ) {
598+
isDraggable = uiDialog.is( ":data(ui-draggable)" );
599+
if ( isDraggable && !value ) {
600+
uiDialog.draggable( "destroy" );
601+
}
620602

621-
// currently non-resizable, becoming resizable
622-
if ( !isResizable && value !== false ) {
623-
this._makeResizable( value );
624-
}
625-
break;
626-
case "title":
627-
// convert whatever was passed in to a string, for html() to not throw up
628-
// TODO deduplicate this (see _create)
629-
$( ".ui-dialog-title", this.uiDialogTitlebar )
630-
.html( "" + ( value || " " ) );
631-
break;
603+
if ( !isDraggable && value ) {
604+
this._makeDraggable();
605+
}
606+
}
607+
608+
if ( key === "position" ) {
609+
this._position( value );
610+
}
611+
612+
if ( key === "resizable" ) {
613+
// currently resizable, becoming non-resizable
614+
isResizable = uiDialog.is( ":data(ui-resizable)" );
615+
if ( isResizable && !value ) {
616+
uiDialog.resizable( "destroy" );
617+
}
618+
619+
// currently resizable, changing handles
620+
if ( isResizable && typeof value === "string" ) {
621+
uiDialog.resizable( "option", "handles", value );
622+
}
623+
624+
// currently non-resizable, becoming resizable
625+
if ( !isResizable && value !== false ) {
626+
this._makeResizable( value );
627+
}
628+
}
629+
630+
if ( key === "title" ) {
631+
// convert whatever was passed in to a string, for html() to not throw up
632+
// TODO deduplicate this (see _create)
633+
$( ".ui-dialog-title", this.uiDialogTitlebar )
634+
.html( "" + ( value || " " ) );
632635
}
633636
},
634637

0 commit comments

Comments
 (0)