diff options
Diffstat (limited to 'src/jquery/jquery.js')
| -rw-r--r-- | src/jquery/jquery.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index f986d28f8..0b0972e9c 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -441,7 +441,7 @@ jQuery.fn = jQuery.prototype = { for ( var prop in obj ) jQuery.attr( type ? this.style : this, - prop, jQuery.prop(this, obj[prop], type, index) + prop, jQuery.prop(this, obj[prop], type, index, prop) ); }); }, @@ -1262,13 +1262,16 @@ jQuery.extend({ return obj; }, - prop: function(elem, value, type, index){ + prop: function(elem, value, type, index, prop){ // Handle executable functions if ( jQuery.isFunction( value ) ) return value.call( elem, [index] ); + + // exclude the following css properties to add px + var exclude = /z-?index|font-?weight|opacity/i; // Handle passing in a number to a CSS property - if ( value.constructor == Number && type == "curCSS" ) + if ( value.constructor == Number && type == "curCSS" && !exclude.test(prop) ) return value + "px"; return value; |