Skip to content

Commit 41ec411

Browse files
committed
Tabs: Show panels on destroy. Fixes #8795 - Tabs: 'display: none;' attribute is not removed from tabs when destroy is called.
(cherry picked from commit fd48568)
1 parent b5cf5b6 commit 41ec411

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

tests/unit/testsuite.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,33 @@ window.domEqual = function( selector, modifier, message ) {
205205
"title"
206206
];
207207

208+
function getElementStyles( elem ) {
209+
var key, len,
210+
style = elem.ownerDocument.defaultView ?
211+
elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
212+
elem.currentStyle,
213+
styles = {};
214+
215+
if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
216+
len = style.length;
217+
while ( len-- ) {
218+
key = style[ len ];
219+
if ( typeof style[ key ] === "string" ) {
220+
styles[ $.camelCase( key ) ] = style[ key ];
221+
}
222+
}
223+
// support: Opera, IE <9
224+
} else {
225+
for ( key in style ) {
226+
if ( typeof style[ key ] === "string" ) {
227+
styles[ key ] = style[ key ];
228+
}
229+
}
230+
}
231+
232+
return styles;
233+
}
234+
208235
function extract( elem ) {
209236
if ( !elem || !elem.length ) {
210237
QUnit.push( false, actual, expected,
@@ -222,6 +249,7 @@ window.domEqual = function( selector, modifier, message ) {
222249
var value = elem.attr( attr );
223250
result[ attr ] = value !== undefined ? value : "";
224251
});
252+
result.style = getElementStyles( elem[ 0 ] );
225253
result.events = $._data( elem[ 0 ], "events" );
226254
result.data = $.extend( {}, elem.data() );
227255
delete result.data[ $.expando ];

ui/jquery.ui.tabs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,8 @@ $.widget( "ui.tabs", {
727727
}
728728
});
729729

730+
this.panels.show();
731+
730732
if ( this.options.heightStyle !== "content" ) {
731733
this.panels.css( "height", "" );
732734
}

0 commit comments

Comments
 (0)