X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=9e62fe3cb7f37cb845b23baee2eeb5c83a63ace7;hb=665e1959cc03292a5109796dc1618d3848ec6f6e;hp=9f9aac66a0cc04c22bfc24aed9a8a461a93681bd;hpb=df61a63fca0bc7d1d3e3a0e7ec1e06ce2bd8fb53;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 9f9aac6..9e62fe3 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;