Skip to content
Permalink
Browse files

Dialog: Removed broken disabled option from dialog, defuse disable/en…

…able methods. Disabling dialogs is not supported.
  • Loading branch information...
jzaefferer committed Nov 17, 2012
1 parent b27db7e commit 0be97bf8c01394cd68134b104bcbf30b27859531
Showing with 13 additions and 26 deletions.
  1. +6 −26 tests/unit/dialog/dialog_methods.js
  2. +7 −0 ui/jquery.ui.dialog.js
@@ -47,32 +47,12 @@ test("destroy", function() {
});
});

test("enable", function() {
expect( 3 );

var el,
expected = $('<div></div>').dialog(),
actual = expected.dialog('enable');
equal(actual, expected, 'enable is chainable');

el = $('<div></div>').dialog({ disabled: true });
el.dialog('enable');
equal(el.dialog('option', 'disabled'), false, 'enable method sets disabled option to false');
ok(!el.dialog('widget').hasClass('ui-dialog-disabled'), 'enable method removes ui-dialog-disabled class from ui-dialog element');
});

test("disable", function() {
expect( 3 );

var el,
expected = $('<div></div>').dialog(),
actual = expected.dialog('disable');
equal(actual, expected, 'disable is chainable');

el = $('<div></div>').dialog({ disabled: false });
el.dialog('disable');
equal(el.dialog('option', 'disabled'), true, 'disable method sets disabled option to true');
ok(el.dialog('widget').hasClass('ui-dialog-disabled'), 'disable method adds ui-dialog-disabled class to ui-dialog element');
test( "enable/disable disabled", function() {
expect( 2 );
var el = $( "<div></div>" ).dialog();
el.dialog( "disable" );
equal(el.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
ok( !el.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
});

test("close", function() {
@@ -152,6 +152,9 @@ $.widget("ui.dialog", {
return this.uiDialog;
},

disable: $.noop,
enable: $.noop,

close: function( event ) {
var that = this;

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

if ( key === "disabled" ) {
return;
}

this._super( key, value );

if ( key === "buttons" ) {

0 comments on commit 0be97bf

Please sign in to comment.
You can’t perform that action at this time.