git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df61a63
)
Fix for #476
author
Jörn Zaefferer
<joern.zaefferer@gmail.com>
Mon, 11 Dec 2006 09:25:44 +0000
(09:25 +0000)
committer
Jörn Zaefferer
<joern.zaefferer@gmail.com>
Mon, 11 Dec 2006 09:25:44 +0000
(09:25 +0000)
src/jquery/jquery.js
patch
|
blob
|
history
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
9f9aac6
..
9e62fe3
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-1285,11
+1285,6
@@
jQuery.extend({
\r
ret = elem.style[prop];
\r
\r
\r
ret = elem.style[prop];
\r
\r
- } else if (elem.currentStyle) {
\r
-
\r
- var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
\r
- ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
\r
-
\r
} else if (document.defaultView && document.defaultView.getComputedStyle) {
\r
\r
if (prop == "cssFloat" || prop == "styleFloat")
\r
} else if (document.defaultView && document.defaultView.getComputedStyle) {
\r
\r
if (prop == "cssFloat" || prop == "styleFloat")
\r
@@
-1308,6
+1303,11
@@
jQuery.extend({
ret = c && c.getPropertyValue(prop) || '';
\r
});
\r
\r
ret = c && c.getPropertyValue(prop) || '';
\r
});
\r
\r
+ } else if (elem.currentStyle) {
\r
+
\r
+ var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
\r
+ ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
\r
+
\r
}
\r
\r
return ret;
\r
}
\r
\r
return ret;
\r