r2326 - Merged r2300 and r2307 to 1.7.1 (fixes #4331 - Accordion requires theme CSS to function i...
Author: rdworth
Date: Wed Mar 18 17:37:05 2009
New Revision: 2326
Added:
branches/1.7.1/tests/visual/accordion/accordion_ticket_4331.html
- copied unchanged from r2300,
/trunk/tests/visual/accordion/accordion_ticket_4331.html
Modified:
branches/1.7.1/tests/visual/accordion/ (props changed)
branches/1.7.1/ui/ui.accordion.js (contents, props changed)
Log:
Merged r2300 and r2307 to 1.7.1 (fixes #4331 - Accordion requires theme CSS
to function in IE)
Modified: branches/1.7.1/ui/ui.accordion.js
==============================================================================
--- branches/1.7.1/ui/ui.accordion.js (original)
+++ branches/1.7.1/ui/ui.accordion.js Wed Mar 18 17:37:05 2009
@@ -423,7 +423,7 @@
// fix width before calculating height of hidden element
var s = options.toShow;
originalWidth = s[0].style.width;
- s.width( parseInt(s.parent().width(),10) -
parseInt(s.css("paddingLeft"),10) - parseInt(s.css("paddingRight"),10) -
parseInt(s.css("borderLeftWidth"),10) -
parseInt(s.css("borderRightWidth"),10) );
+ s.width( parseInt(s.parent().width(),10) -
parseInt(s.css("paddingLeft"),10) - parseInt(s.css("paddingRight"),10) -
(parseInt(s.css("borderLeftWidth"),10) || 0) -
(parseInt(s.css("borderRightWidth"),10) || 0) );
$.each(fxAttrs, function(i, prop) {
hideProps[prop] = 'hide';