Skip to content

Commit 6dccd91

Browse files
committed
Dialog: Removed broken disabled option from dialog, defuse disable/enable methods. Disabling dialogs is not supported.
1 parent 92b8a41 commit 6dccd91

File tree

2 files changed

+13
-26
lines changed

2 files changed

+13
-26
lines changed

tests/unit/dialog/dialog_methods.js

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,12 @@ test("destroy", function() {
4747
});
4848
});
4949

50-
test("enable", function() {
51-
expect( 3 );
52-
53-
var el,
54-
expected = $('<div></div>').dialog(),
55-
actual = expected.dialog('enable');
56-
equal(actual, expected, 'enable is chainable');
57-
58-
el = $('<div></div>').dialog({ disabled: true });
59-
el.dialog('enable');
60-
equal(el.dialog('option', 'disabled'), false, 'enable method sets disabled option to false');
61-
ok(!el.dialog('widget').hasClass('ui-dialog-disabled'), 'enable method removes ui-dialog-disabled class from ui-dialog element');
62-
});
63-
64-
test("disable", function() {
65-
expect( 3 );
66-
67-
var el,
68-
expected = $('<div></div>').dialog(),
69-
actual = expected.dialog('disable');
70-
equal(actual, expected, 'disable is chainable');
71-
72-
el = $('<div></div>').dialog({ disabled: false });
73-
el.dialog('disable');
74-
equal(el.dialog('option', 'disabled'), true, 'disable method sets disabled option to true');
75-
ok(el.dialog('widget').hasClass('ui-dialog-disabled'), 'disable method adds ui-dialog-disabled class to ui-dialog element');
50+
test( "enable/disable disabled", function() {
51+
expect( 2 );
52+
var el = $( "<div></div>" ).dialog();
53+
el.dialog( "disable" );
54+
equal(el.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
55+
ok( !el.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
7656
});
7757

7858
test("close", function() {

ui/jquery.ui.dialog.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ $.widget("ui.dialog", {
152152
return this.uiDialog;
153153
},
154154

155+
disable: $.noop,
156+
enable: $.noop,
157+
155158
close: function( event ) {
156159
var that = this;
157160

@@ -578,6 +581,10 @@ $.widget("ui.dialog", {
578581
.addClass( value );
579582
}
580583

584+
if ( key === "disabled" ) {
585+
return;
586+
}
587+
581588
this._super( key, value );
582589

583590
if ( key === "buttons" ) {

0 commit comments

Comments
 (0)