Skip to content

Commit 1c7d11b

Browse files
committed
Dialog: Update classes option to use empty string instead of null
1 parent 1f94e9b commit 1c7d11b

File tree

2 files changed

+35
-19
lines changed

2 files changed

+35
-19
lines changed

tests/unit/dialog/dialog_common.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ TestHelpers.commonWidgetTests( "dialog", {
55
buttons: [],
66
classes: {
77
"ui-dialog": "ui-corner-all",
8-
"ui-dialog-content": null,
8+
"ui-dialog-content": "",
99
"ui-dialog-titlebar": "ui-corner-all",
10-
"ui-dialog-titlebar-close": null,
11-
"ui-dialog-title": null,
12-
"ui-dialog-buttons": null,
13-
"ui-dialog-buttonpane": null,
14-
"ui-dialog-buttonset": null,
15-
"ui-dialog-dragging": null,
16-
"ui-dialog-resizing": null,
17-
"ui-widget-overlay": null
10+
"ui-dialog-titlebar-close": "",
11+
"ui-dialog-title": "",
12+
"ui-dialog-buttons": "",
13+
"ui-dialog-buttonpane": "",
14+
"ui-dialog-buttonset": "",
15+
"ui-dialog-dragging": "",
16+
"ui-dialog-resizing": "",
17+
"ui-widget-overlay": ""
1818
},
1919
closeOnEscape: true,
2020
closeText: "Close",

ui/dialog.js

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $.widget( "ui.dialog", {
3434
_elementsFromClassKey: function( classKey ) {
3535
switch( classKey ) {
3636
case "ui-dialog":
37-
return this.widget();
37+
return this.uiDialog;
3838
case "ui-dialog-content":
3939
return this.element;
4040
case "ui-dialog-titlebar":
@@ -43,6 +43,22 @@ $.widget( "ui.dialog", {
4343
if ( this.uiDialogTitlebar.hasClass( classKey ) ) {
4444
return this.uiDialogTitlebar;
4545
}
46+
case "ui-dialog-title":
47+
return this.uiDialogTitle;
48+
case "ui-dialog-buttons":
49+
case "ui-dialog-dragging":
50+
case "ui-dialog-resizing":
51+
if ( this.uiDialog.hasClass( classKey ) ) {
52+
return this.uiDialog;
53+
}
54+
case "ui-dialog-buttonset":
55+
return this.uiButtonSet;
56+
case "ui-dialog-buttonpane":
57+
return this.uiDialogButtonPane;
58+
case "ui-dialog-overlay":
59+
if ( this.overlay ) {
60+
return this.overlay
61+
}
4662
default:
4763
return this._superApply( arguments );
4864
}
@@ -53,16 +69,16 @@ $.widget( "ui.dialog", {
5369
buttons: [],
5470
classes: {
5571
"ui-dialog": "ui-corner-all",
56-
"ui-dialog-content": null,
72+
"ui-dialog-content": "",
5773
"ui-dialog-titlebar": "ui-corner-all",
58-
"ui-dialog-titlebar-close": null,
59-
"ui-dialog-title": null,
60-
"ui-dialog-buttons": null,
61-
"ui-dialog-buttonpane": null,
62-
"ui-dialog-buttonset": null,
63-
"ui-dialog-dragging": null,
64-
"ui-dialog-resizing": null,
65-
"ui-widget-overlay": null
74+
"ui-dialog-titlebar-close": "",
75+
"ui-dialog-title": "",
76+
"ui-dialog-buttons": "",
77+
"ui-dialog-buttonpane": "",
78+
"ui-dialog-buttonset": "",
79+
"ui-dialog-dragging": "",
80+
"ui-dialog-resizing": "",
81+
"ui-widget-overlay": ""
6682
},
6783
closeOnEscape: true,
6884
closeText: "Close",

0 commit comments

Comments
 (0)