library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog: Restore inline styles for dimensions/display. Fixes #8119 - Dialog: Destroying a dialog leaves some styles changed.

Browse Source
This commit is contained in:
Scott González 2012-12-05 11:53:34 -05:00
parent 70f5d18c71
commit f59f5a8b12
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,12 +34,9 @@ test("init", function() {
}); });
test("destroy", function() { test("destroy", function() {
expect( 6 ); expect( 7 );
// Dialogs are expected to be hidden on destroy, so make sure they're hidden
// before the test
$( "#dialog1, #form-dialog" ).hide(); $( "#dialog1, #form-dialog" ).hide();
domEqual( "#dialog1", function() { domEqual( "#dialog1", function() {
var dialog = $( "#dialog1" ).dialog().dialog( "destroy" ); var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] ); equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
@ -50,6 +47,16 @@ test("destroy", function() {
equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] ); equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
equal( dialog.index(), 2 ); equal( dialog.index(), 2 );
}); });
// Ensure dimensions are restored (#8119)
$( "#dialog1" ).show().css({
width: "400px",
minHeight: "100px",
height: "200px"
});
domEqual( "#dialog1", function() {
$( "#dialog1" ).dialog().dialog( "destroy" );
});
}); });
test( "enable/disable disabled", function() { test( "enable/disable disabled", function() {

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

@ -84,6 +84,12 @@ $.widget("ui.dialog", {
}, },
_create: function() { _create: function() {
this.originalCss = {
display: this.element[0].style.display,
width: this.element[0].style.width,
minHeight: this.element[0].style.minHeight,
height: this.element[0].style.height
};
this.originalTitle = this.element.attr( "title" ); this.originalTitle = this.element.attr( "title" );
this.options.title = this.options.title || this.originalTitle; this.options.title = this.options.title || this.originalTitle;
this.oldPosition = { this.oldPosition = {
@ -127,12 +133,7 @@ $.widget("ui.dialog", {
this.element this.element
.removeUniqueId() .removeUniqueId()
.removeClass( "ui-dialog-content ui-widget-content" ) .removeClass( "ui-dialog-content ui-widget-content" )
.css({ .css( this.originalCss )
width: "",
minHeight: "",
height: ""
})
.hide()
// without detaching first, the following becomes really slow // without detaching first, the following becomes really slow
.detach(); .detach();