library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Removed broken disabled option from dialog, defuse disable/enable methods. Disabling dialogs is not supported.

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-11-17 11:31:57 +01:00
parent b27db7e3b9
commit 0be97bf8c0
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/unit/dialog/dialog_methods.js
View File

@ -47,32 +47,12 @@ test("destroy", function() {
}); });
}); });
test("enable", function() { test( "enable/disable disabled", function() {
expect( 3 ); expect( 2 );
var el = $( "<div></div>" ).dialog();
var el, el.dialog( "disable" );
expected = $('<div></div>').dialog(), equal(el.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
actual = expected.dialog('enable'); ok( !el.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
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("close", function() { test("close", function() {

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

@ -152,6 +152,9 @@ $.widget("ui.dialog", {
return this.uiDialog; return this.uiDialog;
}, },
disable: $.noop,
enable: $.noop,
close: function( event ) { close: function( event ) {
var that = this; var that = this;
@ -578,6 +581,10 @@ $.widget("ui.dialog", {
.addClass( value ); .addClass( value );
} }
if ( key === "disabled" ) {
return;
}
this._super( key, value ); this._super( key, value );
if ( key === "buttons" ) { if ( key === "buttons" ) {