git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added an improvement to quickExpr and some more tests for jQuery('html'). Fixes ...
[jquery.git]
/
src
/
css.js
diff --git
a/src/css.js
b/src/css.js
index
12f9d51
..
5dd8dd0
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-1,9
+1,20
@@
// exclude the following css properties to add px
// exclude the following css properties to add px
-var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+ ralpha = /alpha\([^)]*\)/,
+ ropacity = /opacity=([^)]*)/,
+ rfloat = /float/i,
+ rdashAlpha = /-([a-z])/ig,
+ rupper = /([A-Z])/g,
+ rnumpx = /^\d+(?:px)?$/i,
+ rnum = /^\d/,
+
// 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 );
@@
-21,6
+32,14
@@
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++ ) {
@@
-30,11
+49,11
@@
jQuery.fn.css = function( name, value ) {
for ( var prop in options ) {
value = options[prop];
for ( var prop in options ) {
value = options[prop];
- if ( isFunction ) {
+ if ( isFunction[prop] ) {
value = value.call( elem, i );
}
value = value.call( elem, i );
}
- if ( typeof value === "number" && !exclude.test(prop) ) {
+ if ( typeof value === "number" && !rexclude.test(prop) ) {
value = value + "px";
}
value = value + "px";
}
@@
-48,70
+67,75
@@
jQuery.fn.css = function( name, value ) {
jQuery.extend({
style: function( elem, name, value ) {
// don't set styles on text and comment nodes
jQuery.extend({
style: function( elem, name, value ) {
// don't set styles on text and comment nodes
- if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+ if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
return undefined;
return undefined;
+ }
// ignore negative width and height values #1599
// ignore negative width and height values #1599
- if ( (name == 'width' || name == 'height') && parseFloat(value) < 0 )
+ if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
value = undefined;
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
- if ( !jQuery.support.opacity && name == "opacity" ) {
+ if ( !jQuery.support.opacity && name === "opacity" ) {
if ( set ) {
// IE has trouble with opacity if it does not have layout
// Force it by setting the zoom level
style.zoom = 1;
// Set the alpha filter to set the opacity
if ( set ) {
// IE has trouble with opacity if it does not have layout
// Force it by setting the zoom level
style.zoom = 1;
// Set the alpha filter to set the opacity
- style.filter = (style.filter || "").replace( /alpha\([^)]*\)/, "" ) +
- (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+ style.filter = (style.filter || "").replace( ralpha, "" ) +
+ (parseInt( value ) + '' === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
}
return style.filter && style.filter.indexOf("opacity=") >= 0 ?
- (parseFloat( style.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ (parseFloat( ropacity.exec(style.filter)[1] ) / 100) + '':
"";
}
// Make sure we're using the right name for getting the float value
"";
}
// Make sure we're using the right name for getting the float value
- if ( /float/i.test( name ) )
+ if ( rfloat.test( name ) ) {
name = styleFloat;
name = styleFloat;
+ }
- name = name.replace(/-([a-z])/ig, function(all, letter){
- return letter.toUpperCase();
- });
+ name = name.replace(rdashAlpha, fcamelCase);
- if ( set )
+ if ( set ) {
style[ name ] = value;
style[ name ] = value;
+ }
return style[ name ];
},
css: function( elem, name, force, extra ) {
return style[ name ];
},
css: function( elem, name, force, extra ) {
- if ( name == "width" || name == "height" ) {
- var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+ if ( name === "width" || name === "height" ) {
+ var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name === "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
function getWH() {
function getWH() {
- val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+ val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
- if ( extra === "border" )
- return;
+ if ( extra === "border" ) { return; }
jQuery.each( which, function() {
jQuery.each( which, function() {
- if ( !extra )
+ if ( !extra ) {
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
- if ( extra === "margin" )
+ }
+
+ if ( extra === "margin" ) {
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
- else
+ } else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+ }
});
}
});
}
- if ( elem.offsetWidth !== 0 )
+ if ( elem.offsetWidth !== 0 ) {
getWH();
getWH();
- else
+ } else {
jQuery.swap( elem, props, getWH );
jQuery.swap( elem, props, getWH );
+ }
return Math.max(0, Math.round(val));
}
return Math.max(0, Math.round(val));
}
@@
-123,15
+147,9
@@
jQuery.extend({
var ret, style = elem.style, filter;
// IE uses filters for opacity
var ret, style = elem.style, filter;
// IE uses filters for opacity
- if ( !jQuery.support.opacity && name == "opacity" ) {
- filter = (filter = style.filter) && filter.indexOf("opacity=") >= 0 ?
- filter :
- (filter = elem.currentStyle[ 'filter' ]) && filter.indexOf("opacity=") >= 0 ?
- filter :
- null;
-
- ret = filter && filter.indexOf("opacity=") >= 0 ?
- (parseFloat( filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+ if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
+ ret = ropacity.test(elem.currentStyle.filter || "") ?
+ (parseFloat(RegExp.$1) / 100) + "" :
"";
return ret === "" ?
"";
return ret === "" ?
@@
-140,8
+158,9
@@
jQuery.extend({
}
// Make sure we're using the right name for getting the float value
}
// Make sure we're using the right name for getting the float value
- if ( /float/i.test( name ) )
+ if ( rfloat.test( name ) ) {
name = styleFloat;
name = styleFloat;
+ }
if ( !force && style && style[ name ] ) {
ret = style[ name ];
if ( !force && style && style[ name ] ) {
ret = style[ name ];
@@
-149,24
+168,25
@@
jQuery.extend({
} else if ( getComputedStyle ) {
// Only "float" is needed here
} else if ( getComputedStyle ) {
// Only "float" is needed here
- if ( /float/i.test( name ) )
+ if ( rfloat.test( name ) ) {
name = "float";
name = "float";
+ }
- name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+ name = name.replace( rupper, "-$1" ).toLowerCase();
var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
var computedStyle = elem.ownerDocument.defaultView.getComputedStyle( elem, null );
- if ( computedStyle )
+ if ( computedStyle ) {
ret = computedStyle.getPropertyValue( name );
ret = computedStyle.getPropertyValue( name );
+ }
// We should always get a number back from opacity
// We should always get a number back from opacity
- if ( name == "opacity" && ret == "" )
+ if ( name === "opacity" && ret === "" ) {
ret = "1";
ret = "1";
+ }
} else if ( elem.currentStyle ) {
} else if ( elem.currentStyle ) {
- var camelCase = name.replace(/\-(\w)/g, function(all, letter){
- return letter.toUpperCase();
- });
+ var camelCase = name.replace(rdashAlpha, fcamelCase);
ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
@@
-175,7
+195,7
@@
jQuery.extend({
// If we're not dealing with a regular pixel number
// but a number that has a weird ending, we need to convert it to pixels
// If we're not dealing with a regular pixel number
// but a number that has a weird ending, we need to convert it to pixels
- if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+ if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
// Remember the original values
var left = style.left, rsLeft = elem.runtimeStyle.left;
// Remember the original values
var left = style.left, rsLeft = elem.runtimeStyle.left;
@@
-196,6
+216,7
@@
jQuery.extend({
// A method for quickly swapping in/out CSS properties to get correct calculations
swap: function( elem, options, callback ) {
var old = {};
// A method for quickly swapping in/out CSS properties to get correct calculations
swap: function( elem, options, callback ) {
var old = {};
+
// Remember the old values, and insert the new ones
for ( var name in options ) {
old[ name ] = elem.style[ name ];
// Remember the old values, and insert the new ones
for ( var name in options ) {
old[ name ] = elem.style[ name ];
@@
-205,7
+226,8
@@
jQuery.extend({
callback.call( elem );
// Revert the old values
callback.call( elem );
// Revert the old values
- for ( var name in options )
+ for ( var name in options ) {
elem.style[ name ] = old[ name ];
elem.style[ name ] = old[ name ];
+ }
}
}
-});
\ No newline at end of file
+});