Skip to content
Permalink
Browse files

Make sure that opacity is being reset properly on a show animation. A…

…dditionally expose jQuery.isNaN from the data module.
  • Loading branch information
jeresig committed Sep 27, 2010
1 parent 0da700a commit 0be7f4eb4f027dce00f11d7816290022d447d336
Showing with 27 additions and 21 deletions.
  1. +7 −0 src/core.js
  2. +13 −9 src/css.js
  3. +2 −3 src/data.js
  4. +5 −9 test/unit/effects.js
@@ -33,6 +33,9 @@ var jQuery = function( selector, context ) {
// Check for non-word characters
rnonword = /\W/,

// Check for digits
rdigit = /\d/,

// Match a standalone tag
rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,

@@ -488,6 +491,10 @@ jQuery.extend({
return obj && typeof obj === "object" && "setInterval" in obj;
},

isNaN: function( obj ) {
return obj == null || !rdigit.test( obj ) || isNaN( obj );
},

type: function( obj ) {
return obj == null ?
String( obj ) :
@@ -32,10 +32,15 @@ jQuery.extend({
// behavior of getting and setting a style property
cssHooks: {
opacity: {
get: function( elem ) {
// We should always get a number back from opacity
var ret = curCSS( elem, "opacity", "opacity" );
return ret === "" ? "1" : ret;
get: function( elem, computed ) {
if ( computed ) {
// We should always get a number back from opacity
var ret = curCSS( elem, "opacity", "opacity" );
return ret === "" ? "1" : ret;

} else {
return elem.style.opacity;
}
}
}
},
@@ -176,7 +181,7 @@ if ( !jQuery.support.opacity ) {
// IE uses filters for opacity
return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
(parseFloat(RegExp.$1) / 100) + "" :
"1";
computed ? "1" : "";
},

set: function( elem, value ) {
@@ -187,11 +192,10 @@ if ( !jQuery.support.opacity ) {
style.zoom = 1;

// Set the alpha filter to set the opacity
var opacity = isNaN(value) ?
var opacity = jQuery.isNaN(value) ?
"" :
"alpha(opacity=" + value * 100 + ")";

var filter = style.filter || elem.currentStyle && elem.currentStyle.filter || "";
"alpha(opacity=" + value * 100 + ")",
filter = style.filter || "";

style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
@@ -1,8 +1,7 @@
(function( jQuery ) {

var windowData = {},
rbrace = /^(?:\{.*\}|\[.*\])$/,
rdigit = /\d/;
rbrace = /^(?:\{.*\}|\[.*\])$/;

jQuery.extend({
cache: {},
@@ -174,7 +173,7 @@ jQuery.fn.extend({
data = data === "true" ? true :
data === "false" ? false :
data === "null" ? null :
rdigit.test( data ) && !isNaN( data ) ? parseFloat( data ) :
!jQuery.isNaN( data ) ? parseFloat( data ) :
rbrace.test( data ) ? jQuery.parseJSON( data ) :
data;
} catch( e ) {}
@@ -389,32 +389,32 @@ jQuery.each( {
"CSS Auto": function(elem,prop){
jQuery(elem).addClass("auto" + prop)
.text("This is a long string of text.");
return prop == "opacity" ? 1 : "";
return "";
},
"JS Auto": function(elem,prop){
jQuery(elem).css(prop,"")
.text("This is a long string of text.");
return prop == "opacity" ? 1 : "";
return "";
},
"CSS 100": function(elem,prop){
jQuery(elem).addClass("large" + prop);
return prop == "opacity" ? 1 : "";
return "";
},
"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 prop == "opacity" ? 0.5 : "";
return "";
},
"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 prop == "opacity" ? 0 : "";
return "";
},
"JS 0": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -481,10 +481,6 @@ jQuery.each( {

var cur_o = jQuery.style(this, "opacity");

if ( cur_o !== "" ) {
cur_o = jQuery.css(this, "opacity");
}

if ( t_o == "hide" || t_o == "show" )
equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);

0 comments on commit 0be7f4e

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