X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcss.js;h=b9a1c52bee1af111280d264560ec802cdee8072c;hb=6dd2dc42700fff681513aa5a3bdc438bd48f4ba0;hp=84b6e6023f2321c01763bd84ca5d0bac1be41ccd;hpb=77e310b906112c9e20dfbf0e91249a0b81cf6107;p=jquery.git diff --git a/src/css.js b/src/css.js index 84b6e60..b9a1c52 100644 --- a/src/css.js +++ b/src/css.js @@ -155,7 +155,7 @@ jQuery.each(["height", "width"], function( i, name ) { }, set: function( elem, value ) { - if ( value !== "" ) { + if ( rnumpx.test( value ) ) { // ignore negative width and height values #1599 value = parseFloat(value); @@ -174,7 +174,7 @@ if ( !jQuery.support.opacity ) { jQuery.cssHooks.opacity = { get: function( elem, computed ) { // IE uses filters for opacity - return ropacity.test((computed ? elem.currentStyle.filter : elem.style.filter) || "") ? + return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ? (parseFloat(RegExp.$1) / 100) + "" : "1"; }, @@ -191,7 +191,7 @@ if ( !jQuery.support.opacity ) { "" : "alpha(opacity=" + value * 100 + ")"; - var filter = style.filter || elem.currentStyle.filter || ""; + var filter = style.filter || elem.currentStyle && elem.currentStyle.filter || ""; style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : @@ -219,7 +219,7 @@ if ( getComputedStyle ) { } else if ( document.documentElement.currentStyle ) { curCSS = function( elem, name ) { - var left, rsLeft, ret = elem.currentStyle[ name ], style = elem.style; + var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style; // From the awesome hack by Dean Edwards // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291