Skip to content
Permalink
Browse files

Making some more adjustments to handle auto CSS properties.

  • Loading branch information...
jeresig committed Sep 13, 2010
1 parent 8b70159 commit 2bda99c18a0372eed02472e9d318676e180281da
Showing with 12 additions and 12 deletions.
  1. +1 −1 src/css.js
  2. +2 −2 src/effects.js
  3. +9 −9 test/unit/effects.js
@@ -77,7 +77,7 @@ jQuery.extend({
} else if ( !force && style[ name ] ) {
ret = style[ name ];

} else if ( curCSS ) {
} else if ( force !== false && curCSS ) {
ret = curCSS( elem, name, origName );
}

@@ -349,7 +349,7 @@ jQuery.fx.prototype = {
// Simple 'show' function
show: function() {
// Remember where we started, so that we can go back to it later
this.options.orig[this.prop] = jQuery.css( this.elem, this.prop );
this.options.orig[this.prop] = jQuery.css( this.elem, this.prop, undefined, false );
this.options.show = true;

// Begin the animation
@@ -364,7 +364,7 @@ jQuery.fx.prototype = {
// Simple 'hide' function
hide: function() {
// Remember where we started, so that we can go back to it later
this.options.orig[this.prop] = jQuery.css( this.elem, this.prop );
this.options.orig[this.prop] = jQuery.css( this.elem, this.prop, undefined, false );
this.options.hide = true;

// Begin the animation
@@ -390,32 +390,32 @@ jQuery.each( {
"CSS Auto": function(elem,prop){
jQuery(elem).addClass("auto" + prop)
.text("This is a long string of text.");
return "";
return prop == "opacity" ? 1 : "";
},
"JS Auto": function(elem,prop){
jQuery(elem).css(prop,"auto")
.text("This is a long string of text.");
return "";
return prop == "opacity" ? 1 : "";
},
"CSS 100": function(elem,prop){
jQuery(elem).addClass("large" + prop);
return "";
return prop == "opacity" ? 1 : "";
},
"JS 100": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
return prop == "opacity" ? 1 : 100;
},
"CSS 50": function(elem,prop){
jQuery(elem).addClass("med" + prop);
return "";
return prop == "opacity" ? 0.5 : "";
},
"JS 50": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
return prop == "opacity" ? 0.5 : 50;
},
"CSS 0": function(elem,prop){
jQuery(elem).addClass("no" + prop);
return "";
return prop == "opacity" ? 0 : "";
},
"JS 0": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -480,7 +480,7 @@ jQuery.each( {
if ( t_h == "hide"||t_h == "show" )
equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height);

var cur_o = jQuery.css(this, "opacity", undefined, true);
var cur_o = jQuery.css(this, "opacity");
if ( cur_o !== "" ) cur_o = parseFloat( cur_o );

if ( t_o == "hide"||t_o == "show" )
@@ -512,9 +512,9 @@ jQuery.each( {
}

if ( t_h == "show" ) {
var old_h = jQuery.css(this, "height");
jQuery(elem).append("<br/>Some more text<br/>and some more...");
ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
var old_h = jQuery.css(this, "height", undefined, true);
jQuery(this).append("<br/>Some more text<br/>and some more...");
notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto. " + n);
}

start();

0 comments on commit 2bda99c

Please sign in to comment.
You can’t perform that action at this time.