Changeset 13224
- Timestamp:
- 03/26/08 06:27:42 (10 months ago)
- Files:
-
- 1 modified
-
dojo/trunk/fx.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dojo/trunk/fx.js
r13223 r13224 307 307 // it's natural height (with no scrollbar). 308 308 // Node must have no margin/border/padding. 309 var d = dojo; 310 args.node = d.byId(args.node); 311 var node = args.node, s = d.hitch(d, "style", node); 312 313 var anim = d.animateProperty(d.mixin({ 309 args.node = dojo.byId(args.node); 310 var node = args.node, s = node.style; 311 312 var anim = dojo.animateProperty(dojo.mixin({ 314 313 properties: { 315 314 height: { … … 318 317 // start at current [computed] height, but use 1px rather than 0 319 318 // because 0 causes IE to display the whole panel 320 321 s("overflow", "hidden"); 322 323 if(s("visibility") == "hidden" || s("display") =="none"){ 324 s({ 325 "height": 1, 326 "display": "", 327 "visibility": "" 328 }); 319 s.overflow="hidden"; 320 if(s.visibility=="hidden"||s.display=="none"){ 321 s.height="1px"; 322 s.display=""; 323 s.visibility=""; 329 324 return 1; 330 325 }else{ 331 return Math.max(s("height"), 1); 326 var height = dojo.style(node, "height"); 327 return Math.max(height, 1); 332 328 } 333 329 }, 334 330 end: function(){ 335 // console.debug(s("visibility"), s("display"), s("height"), node.scrollHeight);336 331 return node.scrollHeight; 337 332 }