Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #10116: 0003-Fix-getStyle-height-returning-null-when-set-to-au.patch

File 0003-Fix-getStyle-height-returning-null-when-set-to-au.patch, 1.5 kB (added by kangax, 3 months ago)
  • a/src/dom.js

    old new  
    395395    element = $(element); 
    396396    style = style == 'float' ? 'cssFloat' : style.camelize(); 
    397397    var value = element.style[style]; 
    398     if (!value) { 
     398    if (!value || value == 'auto') { 
    399399      var css = document.defaultView.getComputedStyle(element, null); 
    400400      value = css ? css[style] : null; 
    401401    } 
  • a/test/unit/dom.html

    old new  
    385385</div> 
    386386 
    387387<div id='elementToViewportDimensions' style='display: none'></div> 
     388<div id="auto_height" style="height:auto">auto_height</div> 
    388389 
    389390<!-- Tests follow --> 
    390391<script type="text/javascript" language="javascript" charset="utf-8"> 
     
    12871288        this.assertEqual("14px", $('style_test_dimensions').getStyle('width')); 
    12881289        this.assertEqual("17px", $('style_test_dimensions').getStyle('height')); 
    12891290      } 
     1291      // height/width could always be calculated if it's set to "auto" 
     1292      this.assertNotNull($('auto_height').getStyle('height')); 
    12901293    }, 
    12911294     
    12921295    testElementGetOpacity: function() {