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: Refactor _setOption to call _super early. Move dialogClass update above that to access old option value.

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-11-15 22:51:26 +01:00
parent 83a9f219bf
commit fed2972027
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/unit/dialog/dialog_options.js
View File

@ -148,7 +148,7 @@ test("closeText", function() {
}); });
test("dialogClass", function() { test("dialogClass", function() {
expect(4); expect( 6 );
var el = $('<div></div>').dialog(); var el = $('<div></div>').dialog();
equal(el.dialog('widget').is(".foo"), false, 'dialogClass not specified. foo class added'); equal(el.dialog('widget').is(".foo"), false, 'dialogClass not specified. foo class added');
@ -156,6 +156,9 @@ test("dialogClass", function() {
el = $('<div></div>').dialog({ dialogClass: "foo" }); el = $('<div></div>').dialog({ dialogClass: "foo" });
equal(el.dialog('widget').is(".foo"), true, 'dialogClass in init. foo class added'); equal(el.dialog('widget').is(".foo"), true, 'dialogClass in init. foo class added');
el.dialog( "option", "dialogClass", "foobar" );
equal( el.dialog('widget').is(".foo"), false, "dialogClass changed, previous one was removed" );
equal( el.dialog('widget').is(".foobar"), true, "dialogClass changed, new one was added" );
el.remove(); el.remove();
el = $('<div></div>').dialog({ dialogClass: "foo bar" }); el = $('<div></div>').dialog({ dialogClass: "foo bar" });

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

@ -565,6 +565,14 @@ $.widget("ui.dialog", {
var isDraggable, isResizable, var isDraggable, isResizable,
uiDialog = this.uiDialog; uiDialog = this.uiDialog;
if ( key === "dialogClass" ) {
uiDialog
.removeClass( this.options.dialogClass )
.addClass( value );
}
this._super( key, value );
switch ( key ) { switch ( key ) {
case "buttons": case "buttons":
this._createButtons( value ); this._createButtons( value );
@ -575,11 +583,6 @@ $.widget("ui.dialog", {
label: "" + value label: "" + value
}); });
break; break;
case "dialogClass":
uiDialog
.removeClass( this.options.dialogClass )
.addClass( value );
break;
case "disabled": case "disabled":
// TODO use toggleClass( "ui-dialog-disabled", value ) // TODO use toggleClass( "ui-dialog-disabled", value )
if ( value ) { if ( value ) {
@ -625,8 +628,6 @@ $.widget("ui.dialog", {
.html( "" + ( value || "&#160;" ) ); .html( "" + ( value || "&#160;" ) );
break; break;
} }
this._super( key, value );
}, },
_size: function() { _size: function() {