Skip to content
Permalink
Browse files

Added a fix for the Safari computedStyle bug.

  • Loading branch information
jeresig committed Aug 25, 2006
1 parent 9064788 commit 94fc6aac1990dc3233c70f471432c5b9f230e756
Showing with 26 additions and 12 deletions.
  1. +26 −12 src/jquery/jquery.js
@@ -949,21 +949,35 @@ jQuery.extend({
return jQuery.curCSS( e, p );
},

curCSS: function(e,p,force) {
var r;

if (!force && e.style[p])
r = e.style[p];
else if (e.currentStyle) {
var np = p.replace(/\-(\w)/g,function(m,c){return c.toUpperCase()});
r = e.currentStyle[p] || e.currentStyle[np];
curCSS: function(elem, prop, force) {
var ret;

if (!force && elem.style[prop]) {

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[np];

} else if (document.defaultView && document.defaultView.getComputedStyle) {
p = p.replace(/([A-Z])/g,"-$1").toLowerCase();
var s = document.defaultView.getComputedStyle(e,"");
r = s ? s.getPropertyValue(p) : null;

prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
var cur = document.defaultView.getComputedStyle(elem, null);

if ( cur )
ret = cur.getPropertyValue(prop);
else if ( prop == 'display' )
ret = 'none';
else
jQuery.swap(elem, { display: 'block' }, function() {
ret = document.defaultView.getComputedStyle(this,null).getPropertyValue(prop);
});

}

return r;
return ret;
},

clean: function(a) {

0 comments on commit 94fc6aa

Please sign in to comment.
You can’t perform that action at this time.