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: Remove width, min-height, height styles on destroy. Fixes #8119 - Dialog: Destroying a dialog leaves some styles changed.

Browse Source
This commit is contained in:
Scott González 2012-12-04 10:03:05 -05:00
parent 975bde542b
commit 3c2acc3227
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,11 @@ test("init", function() {
test("destroy", function() { test("destroy", function() {
expect( 6 ); expect( 6 );
// Dialogs are expected to be hidden on destroy, so make sure they're hidden
// before the test
$( "#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 ] );

7
tests/unit/testsuite.js
View File

@ -212,7 +212,7 @@ window.domEqual = function( selector, modifier, message ) {
"tabIndex", "tabIndex",
"title" "title"
]; ];
/*
function getElementStyles( elem ) { function getElementStyles( elem ) {
var key, len, var key, len,
style = elem.ownerDocument.defaultView ? style = elem.ownerDocument.defaultView ?
@ -239,7 +239,7 @@ window.domEqual = function( selector, modifier, message ) {
return styles; return styles;
} }
*/
function extract( elem ) { function extract( elem ) {
if ( !elem || !elem.length ) { if ( !elem || !elem.length ) {
QUnit.push( false, actual, expected, QUnit.push( false, actual, expected,
@ -257,8 +257,7 @@ window.domEqual = function( selector, modifier, message ) {
var value = elem.attr( attr ); var value = elem.attr( attr );
result[ attr ] = value !== undefined ? value : ""; result[ attr ] = value !== undefined ? value : "";
}); });
// TODO: Enable when we can figure out what's happening with accordion result.style = getElementStyles( elem[ 0 ] );
//result.style = getElementStyles( elem[ 0 ] );
result.events = $._data( elem[ 0 ], "events" ); result.events = $._data( elem[ 0 ], "events" );
result.data = $.extend( {}, elem.data() ); result.data = $.extend( {}, elem.data() );
delete result.data[ $.expando ]; delete result.data[ $.expando ];

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

@ -127,6 +127,11 @@ $.widget("ui.dialog", {
this.element this.element
.removeUniqueId() .removeUniqueId()
.removeClass( "ui-dialog-content ui-widget-content" ) .removeClass( "ui-dialog-content ui-widget-content" )
.css({
width: "",
minHeight: "",
height: ""
})
.hide() .hide()
// without detaching first, the following becomes really slow // without detaching first, the following becomes really slow
.detach(); .detach();