git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move cases of .replace(re, Function) out from inline (to avoid being redeclared on...
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
b8a1350
..
c32034d
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-3,15
+3,14
@@
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
// cache check for defaultView.getComputedStyle
getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
// normalize float css property
// 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 );
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 ) {
if ( typeof name === "string" ) {
// Are we setting the style?
if ( value === undefined ) {
@@
-25,6
+24,13
@@
jQuery.fn.css = function( name, value ) {
options[ name ] = value;
}
}
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 each element...
for ( var i = 0, l = this.length; i < l; i++ ) {
@@
-34,9
+40,7
@@
jQuery.fn.css = function( name, value ) {
for ( var prop in options ) {
value = options[prop];
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 ( typeof value === "number" && !exclude.test(prop) ) {
value = value + "px";
@@
-55,6
+59,10
@@
jQuery.extend({
if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
return undefined;
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
var style = elem.style || elem, set = value !== undefined;
// IE uses filters for opacity
@@
-70,7
+78,7
@@
jQuery.extend({
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
- (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ (parseFloat( /opacity=([^)]*)/.exec(style.filter)[1] ) / 100) + '':
"";
}
"";
}
@@
-78,9
+86,7
@@
jQuery.extend({
if ( /float/i.test( name ) )
name = styleFloat;
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;
if ( set )
style[ name ] = value;
@@
-120,12
+126,12
@@
jQuery.extend({
},
curCSS: function( elem, name, force ) {
},
curCSS: function( elem, name, force ) {
- var ret, style = elem.style;
+ var ret, style = elem.style, filter;
// IE uses filters for opacity
// 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 === "" ?
"";
return ret === "" ?
@@
-158,9
+164,7
@@
jQuery.extend({
ret = "1";
} else if ( elem.currentStyle ) {
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 ];
ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
@@
-202,4
+206,4
@@
jQuery.extend({
for ( var name in options )
elem.style[ name ] = old[ name ];
}
for ( var name in options )
elem.style[ name ] = old[ name ];
}
-});
\ No newline at end of file
+});