Skip to content
Permalink
Browse files

Revert "Dialog: Cleanup style properties on _destroy. Reenables style…

… check in domEqual, while removing commented and unnecessary old code. Fixes #8119 - Dialog: Destroying a dialog leaves style, scrollleft, and scrolltop leftovers."

This reverts commit d687a1b.
  • Loading branch information...
scottgonzalez committed Dec 4, 2012
1 parent 8072099 commit 050e71bdd88708ce6e8462a89af4399cffa72cf3
Showing with 30 additions and 9 deletions.
  1. +0 −2 tests/unit/dialog/dialog_methods.js
  2. +30 −2 tests/unit/testsuite.js
  3. +0 −5 ui/jquery.ui.dialog.js
@@ -35,8 +35,6 @@ test("init", function() {

test("destroy", function() {
expect( 6 );
// expect dialogs to be hidden before and after
$( "#dialog1, #form-dialog" ).hide();
domEqual( "#dialog1", function() {
var dialog = $( "#dialog1" ).dialog().dialog( "destroy" );
equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] );
@@ -210,10 +210,36 @@ window.domEqual = function( selector, modifier, message ) {
"nodeName",
"role",
"tabIndex",
"title",
"style"
"title"
];
/*
function getElementStyles( elem ) {
var key, len,
style = elem.ownerDocument.defaultView ?
elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
elem.currentStyle,
styles = {};
if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
len = style.length;
while ( len-- ) {
key = style[ len ];
if ( typeof style[ key ] === "string" ) {
styles[ $.camelCase( key ) ] = style[ key ];
}
}
// support: Opera, IE <9
} else {
for ( key in style ) {
if ( typeof style[ key ] === "string" ) {
styles[ key ] = style[ key ];
}
}
}
return styles;
}
*/
function extract( elem ) {
if ( !elem || !elem.length ) {
QUnit.push( false, actual, expected,
@@ -231,6 +257,8 @@ window.domEqual = function( selector, modifier, message ) {
var value = elem.attr( attr );
result[ attr ] = value !== undefined ? value : "";
});
// TODO: Enable when we can figure out what's happening with accordion
//result.style = getElementStyles( elem[ 0 ] );
result.events = $._data( elem[ 0 ], "events" );
result.data = $.extend( {}, elem.data() );
delete result.data[ $.expando ];
@@ -127,11 +127,6 @@ $.widget("ui.dialog", {
this.element
.removeUniqueId()
.removeClass( "ui-dialog-content ui-widget-content" )
.css({
"width": "",
"min-height": "",
"height": ""
})
.hide()
// without detaching first, the following becomes really slow
.detach();

0 comments on commit 050e71b

Please sign in to comment.
You can’t perform that action at this time.