From: Jörn Zaefferer Date: Mon, 11 Dec 2006 09:25:44 +0000 (+0000) Subject: Fix for #476 X-Git-Tag: 1.0.4~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=665e1959cc03292a5109796dc1618d3848ec6f6e;p=jquery.git Fix for #476 --- diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 9f9aac66a..9e62fe3cb 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1285,11 +1285,6 @@ jQuery.extend({ ret = elem.style[prop]; - } else if (elem.currentStyle) { - - var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();}); - ret = elem.currentStyle[prop] || elem.currentStyle[newProp]; - } else if (document.defaultView && document.defaultView.getComputedStyle) { if (prop == "cssFloat" || prop == "styleFloat") @@ -1308,6 +1303,11 @@ jQuery.extend({ ret = c && c.getPropertyValue(prop) || ''; }); + } else if (elem.currentStyle) { + + var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();}); + ret = elem.currentStyle[prop] || elem.currentStyle[newProp]; + } return ret;