library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #812

Browse Source
This commit is contained in:
Jörn Zaefferer 2007-01-16 14:19:01 +00:00
parent 5ebd5f604a
commit 8bd7a3544d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jquery/jquery.js vendored
View File

@ -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;