Skip to content

Commit 3c2acc3

Browse files
committed
Dialog: Remove width, min-height, height styles on destroy. Fixes #8119 - Dialog: Destroying a dialog leaves some styles changed.
1 parent 975bde5 commit 3c2acc3

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

tests/unit/dialog/dialog_methods.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ test("init", function() {
3535

3636
test("destroy", function() {
3737
expect( 6 );
38+
39+
// Dialogs are expected to be hidden on destroy, so make sure they're hidden
40+
// before the test
41+
$( "#dialog1, #form-dialog" ).hide();
42+
3843
domEqual( "#dialog1", function() {
3944
var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
4045
equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );

tests/unit/testsuite.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ window.domEqual = function( selector, modifier, message ) {
212212
"tabIndex",
213213
"title"
214214
];
215-
/*
215+
216216
function getElementStyles( elem ) {
217217
var key, len,
218218
style = elem.ownerDocument.defaultView ?
@@ -239,7 +239,7 @@ window.domEqual = function( selector, modifier, message ) {
239239

240240
return styles;
241241
}
242-
*/
242+
243243
function extract( elem ) {
244244
if ( !elem || !elem.length ) {
245245
QUnit.push( false, actual, expected,
@@ -257,8 +257,7 @@ window.domEqual = function( selector, modifier, message ) {
257257
var value = elem.attr( attr );
258258
result[ attr ] = value !== undefined ? value : "";
259259
});
260-
// TODO: Enable when we can figure out what's happening with accordion
261-
//result.style = getElementStyles( elem[ 0 ] );
260+
result.style = getElementStyles( elem[ 0 ] );
262261
result.events = $._data( elem[ 0 ], "events" );
263262
result.data = $.extend( {}, elem.data() );
264263
delete result.data[ $.expando ];

ui/jquery.ui.dialog.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ $.widget("ui.dialog", {
127127
this.element
128128
.removeUniqueId()
129129
.removeClass( "ui-dialog-content ui-widget-content" )
130+
.css({
131+
width: "",
132+
minHeight: "",
133+
height: ""
134+
})
130135
.hide()
131136
// without detaching first, the following becomes really slow
132137
.detach();

0 commit comments

Comments
 (0)