// cache check for defaultView.getComputedStyle
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
// normalize float css property
- styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat";
+ styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
+ fcamelCase = function(all, letter){
+ return letter.toUpperCase();
+ };
jQuery.fn.css = function( name, value ) {
var options = name, isFunction = jQuery.isFunction( value );
- // ignore negative width and height values
- if ( (name == 'width' || name == 'height') && parseFloat(value) < 0 )
- value = undefined;
-
if ( typeof name === "string" ) {
// Are we setting the style?
if ( value === undefined ) {
options[ name ] = value;
}
}
+
+ var isFunction = {};
+
+ // For each value, determine whether it's a Function so we don't
+ // need to determine it again for each element
+ for ( var prop in options )
+ isFunction[prop] = jQuery.isFunction( options[prop] );
// For each element...
for ( var i = 0, l = this.length; i < l; i++ ) {
for ( var prop in options ) {
value = options[prop];
- if ( isFunction ) {
- value = value.call( elem, i );
- }
+ if ( isFunction[prop] ) value = value.call( elem, i );
if ( typeof value === "number" && !exclude.test(prop) ) {
value = value + "px";
if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
return undefined;
+ // ignore negative width and height values #1599
+ if ( (name == 'width' || name == 'height') && parseFloat(value) < 0 )
+ value = undefined;
+
var style = elem.style || elem, set = value !== undefined;
// IE uses filters for opacity
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
- (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ (parseFloat( /opacity=([^)]*)/.exec(style.filter)[1] ) / 100) + '':
"";
}
if ( /float/i.test( name ) )
name = styleFloat;
- name = name.replace(/-([a-z])/ig, function(all, letter){
- return letter.toUpperCase();
- });
+ name = name.replace(/-([a-z])/ig, fcamelCase);
if ( set )
style[ name ] = value;
},
curCSS: function( elem, name, force ) {
- var ret, style = elem.style;
+ var ret, style = elem.style, filter;
// IE uses filters for opacity
- if ( !jQuery.support.opacity && name == "opacity" ) {
- ret = style.filter && style.filter.indexOf("opacity=") >= 0 ?
- (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+ ret = /opacity=([^)]*)/.test(elem.currentStyle.filter || "") ?
+ (parseFloat(RegExp.$1) / 100) + "" :
"";
return ret === "" ?
ret = "1";
} else if ( elem.currentStyle ) {
- var camelCase = name.replace(/\-(\w)/g, function(all, letter){
- return letter.toUpperCase();
- });
+ var camelCase = name.replace(/\-(\w)/g, fcamelCase);
ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
for ( var name in options )
elem.style[ name ] = old[ name ];
}
-});
\ No newline at end of file
+});