deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaning up some un-needed CSS code and adding back a temporary (deprecated) curCSS method.

Browse source
This commit is contained in:
John Resig 2010-09-17 14:41:28 -04:00
parent 51d258074c
commit 6541eb9d80
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/css.js
View file

@ -21,7 +21,9 @@ var ralpha = /alpha\([^)]*\)/,
jQuery.fn.css = function( name, value ) { jQuery.fn.css = function( name, value ) {
return jQuery.access( this, name, value, true, function( elem, name, value ) { return jQuery.access( this, name, value, true, function( elem, name, value ) {
return jQuery.css( elem, name, value ); return value !== undefined ?
jQuery.style( elem, name, value ) :
jQuery.css( elem, name );
}); });
}; };
@ -90,19 +92,15 @@ jQuery.extend({
} }
}, },
css: function( elem, name, value, extra ) { css: function( elem, name, extra ) {
// Make sure that we're working with the right name // Make sure that we're working with the right name
var ret, origName = name.replace( rdashAlpha, fcamelCase ), var ret, origName = name.replace( rdashAlpha, fcamelCase ),
hooks = jQuery.cssHooks[ origName ]; hooks = jQuery.cssHooks[ origName ];
name = jQuery.cssProps[ origName ] || origName; name = jQuery.cssProps[ origName ] || origName;
// Check if we're setting a value, just use jQuery.style (DEPRECATED)
if ( value !== undefined ) {
jQuery.style( elem, name, value );
// If a hook was provided get the computed value from there // If a hook was provided get the computed value from there
} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) { if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
return ret; return ret;
// Otherwise, if a way to get the computed value exists, use that // Otherwise, if a way to get the computed value exists, use that
@ -130,6 +128,9 @@ jQuery.extend({
} }
}); });
// DEPRECATED, Use jQuery.css() instead
jQuery.curCSS = jQuery.css;
jQuery.each(["height", "width"], function( i, name ) { jQuery.each(["height", "width"], function( i, name ) {
jQuery.cssHooks[ name ] = { jQuery.cssHooks[ name ] = {
get: function( elem, computed, extra ) { get: function( elem, computed, extra ) {

4
src/dimensions.js
View file

@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
// innerHeight and innerWidth // innerHeight and innerWidth
jQuery.fn["inner" + name] = function() { jQuery.fn["inner" + name] = function() {
return this[0] ? return this[0] ?
parseFloat( jQuery.css( this[0], type, undefined, "padding" ), 10 ) : parseFloat( jQuery.css( this[0], type, "padding" ), 10 ) :
null; null;
}; };
// outerHeight and outerWidth // outerHeight and outerWidth
jQuery.fn["outer" + name] = function( margin ) { jQuery.fn["outer" + name] = function( margin ) {
return this[0] ? return this[0] ?
parseFloat( jQuery.css( this[0], type, undefined, margin ? "margin" : "border" ), 10 ) : parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ), 10 ) :
null; null;
}; };