aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2006-12-11 09:25:44 +0000
committerJörn Zaefferer <joern.zaefferer@gmail.com>2006-12-11 09:25:44 +0000
commit665e1959cc03292a5109796dc1618d3848ec6f6e (patch)
tree722d864210186b008ca192dc9826925da75185f7 /src
parentdf61a63fca0bc7d1d3e3a0e7ec1e06ce2bd8fb53 (diff)
downloadjquery-665e1959cc03292a5109796dc1618d3848ec6f6e.tar.gz
jquery-665e1959cc03292a5109796dc1618d3848ec6f6e.zip
Fix for #476
Diffstat (limited to 'src')
-rw-r--r--src/jquery/jquery.js10
1 files changed, 5 insertions, 5 deletions
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;