From a44ec402771f6d622506f39073d0be260400dd21 Mon Sep 17 00:00:00 2001 From: jeresig Date: Wed, 8 Sep 2010 12:00:29 -0400 Subject: Make sure that jQuery works even when the individual modules are loaded separately AND jQuery.noConflict(true) is used. Fixes #7011. --- test/unit/core.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/unit') diff --git a/test/unit/core.js b/test/unit/core.js index 3ba16a486..811d13fb4 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -183,7 +183,7 @@ test("browser", function() { } test("noConflict", function() { - expect(6); + expect(7); var $$ = jQuery; @@ -196,6 +196,7 @@ test("noConflict", function() { equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" ); equals( jQuery, originaljQuery, "Make sure jQuery was reverted." ); equals( $, original$, "Make sure $ was reverted." ); + ok( $$("#main").html("test"), "Make sure that jQuery still works." ); jQuery = $$; }); -- cgit v1.2.3 From 70377a65e2a1c8478f3dc1e0e125b7b25b5324f3 Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 9 Sep 2010 15:48:28 -0400 Subject: Make sure that effect tests no longer reference the old CSS methods. --- test/unit/effects.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/unit') diff --git a/test/unit/effects.js b/test/unit/effects.js index 919e3ea4c..9ff5014c8 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -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.style(this, "opacity"); + var cur_o = jQuery.css(this, "opacity", undefined, true); if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); if ( t_o == "hide"||t_o == "show" ) @@ -492,7 +492,7 @@ jQuery.each( { if ( t_o.constructor == Number ) { equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o); - ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); + ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); } if ( t_w.constructor == Number ) { @@ -512,7 +512,7 @@ jQuery.each( { } if ( t_h == "show" ) { - var old_h = jQuery.curCSS(this, "height"); + var old_h = jQuery.css(this, "height"); jQuery(elem).append("
Some more text
and some more..."); ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto."); } -- cgit v1.2.3 From 2bda99c18a0372eed02472e9d318676e180281da Mon Sep 17 00:00:00 2001 From: John Resig Date: Mon, 13 Sep 2010 18:00:28 -0400 Subject: Making some more adjustments to handle auto CSS properties. --- src/css.js | 2 +- src/effects.js | 4 ++-- test/unit/effects.js | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'test/unit') diff --git a/src/css.js b/src/css.js index b95eb47d0..eb7567f79 100644 --- a/src/css.js +++ b/src/css.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 ); } diff --git a/src/effects.js b/src/effects.js index 352ad4aea..4eb725bd9 100644 --- a/src/effects.js +++ b/src/effects.js @@ -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 diff --git a/test/unit/effects.js b/test/unit/effects.js index 9ff5014c8..cb07f6a20 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -390,16 +390,16 @@ 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"); @@ -407,7 +407,7 @@ jQuery.each( { }, "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"); @@ -415,7 +415,7 @@ jQuery.each( { }, "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("
Some more text
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("
Some more text
and some more..."); + notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto. " + n); } start(); -- cgit v1.2.3 From 2131e1a7ad6d9df239ec00b301303e10dbd34d49 Mon Sep 17 00:00:00 2001 From: jeresig Date: Tue, 14 Sep 2010 09:52:13 -0400 Subject: Removing leftover debug code. --- test/unit/effects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/unit') diff --git a/test/unit/effects.js b/test/unit/effects.js index cb07f6a20..bfd6ff4fc 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -514,7 +514,7 @@ jQuery.each( { if ( t_h == "show" ) { var old_h = jQuery.css(this, "height", undefined, true); jQuery(this).append("
Some more text
and some more..."); - notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto. " + n); + notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto."); } start(); -- cgit v1.2.3 From 37b607d2815b893d13de4ac3461090d0dd46535e Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 16 Sep 2010 10:00:56 -0400 Subject: Split apart jQuery.css into jQuery.css (computed values) and jQuery.style (currently set values). --- src/css.js | 84 ++++++++++++++++++++++++++++++++++------------------ src/dimensions.js | 4 +-- src/effects.js | 22 +++++++------- src/offset.js | 18 +++++------ test/unit/css.js | 12 ++------ test/unit/effects.js | 10 +++---- 6 files changed, 85 insertions(+), 65 deletions(-) (limited to 'test/unit') diff --git a/src/css.js b/src/css.js index eb7567f79..87f9abd70 100644 --- a/src/css.js +++ b/src/css.js @@ -26,6 +26,8 @@ jQuery.fn.css = function( name, value ) { }; jQuery.extend({ + // Add in style property hooks for overriding the default + // behavior of getting and setting a style property cssHooks: { opacity: { get: function( elem ) { @@ -36,7 +38,7 @@ jQuery.extend({ } }, - // exclude the following css properties to add px + // Exclude the following css properties to add px cssNumber: { "zIndex": true, "fontWeight": true, @@ -45,43 +47,67 @@ jQuery.extend({ "lineHeight": true }, + // Add in properties whose names you wish to fix before + // setting or getting the value cssProps: { // normalize float css property "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" }, - css: function( elem, name, value, force, extra ) { - // don't set styles on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { + // Get and set the style property on a DOM Node + style: function( elem, name, value, extra ) { + // Don't set styles on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { return undefined; } + // Make sure that we're working with the right name var ret, origName = name.replace( rdashAlpha, fcamelCase ), - style = elem.style || {}, hooks = jQuery.cssHooks[ origName ] || {}; + style = elem.style, hooks = jQuery.cssHooks[ origName ]; name = jQuery.cssProps[ origName ] || origName; + // Check if we're setting a value if ( value !== undefined ) { + // If a number was passed in, add 'px' to the (except for certain CSS properties) if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) { value += "px"; } - if ( !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) { + // If a hook was provided, use that value, otherwise just set the specified value + if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) { style[ name ] = value; } } else { - if ( !force && "get" in hooks && (ret = hooks.get( elem, force, extra )) !== undefined ) { + // If a hook was provided get the non-computed value from there + if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { return ret; + } - } else if ( !force && style[ name ] ) { - ret = style[ name ]; + // Otherwise just get the value from the style object + return style[ name ]; + } + }, - } else if ( force !== false && curCSS ) { - ret = curCSS( elem, name, origName ); - } + css: function( elem, name, value, extra ) { + // Make sure that we're working with the right name + var ret, origName = name.replace( rdashAlpha, fcamelCase ), + hooks = jQuery.cssHooks[ 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 + } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) { return ret; + + // Otherwise, if a way to get the computed value exists, use that + } else if ( curCSS ) { + return curCSS( elem, name, origName ); } }, @@ -106,19 +132,21 @@ jQuery.extend({ jQuery.each(["height", "width"], function( i, name ) { jQuery.cssHooks[ name ] = { - get: function( elem, force, extra ) { + get: function( elem, computed, extra ) { var val; - if ( elem.offsetWidth !== 0 ) { - val = getWH( elem, name, extra ); - - } else { - jQuery.swap( elem, cssShow, function() { + if ( computed ) { + if ( elem.offsetWidth !== 0 ) { val = getWH( elem, name, extra ); - }); - } - return val + "px"; + } else { + jQuery.swap( elem, cssShow, function() { + val = getWH( elem, name, extra ); + }); + } + + return val + "px"; + } }, set: function( elem, value ) { @@ -134,9 +162,9 @@ jQuery.each(["height", "width"], function( i, name ) { if ( !jQuery.support.opacity ) { jQuery.cssHooks.opacity = { - get: function( elem, force ) { + get: function( elem, computed ) { // IE uses filters for opacity - return ropacity.test(elem.currentStyle.filter || "") ? + return ropacity.test((computed ? elem.currentStyle.filter : elem.style.filter) || "") ? (parseFloat(RegExp.$1) / 100) + "" : "1"; }, @@ -153,7 +181,7 @@ if ( !jQuery.support.opacity ) { "" : "alpha(opacity=" + value * 100 + ")"; - var filter = style.filter || jQuery.css( elem, "filter" ) || ""; + var filter = style.filter || elem.currentStyle.filter || ""; style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : @@ -217,14 +245,14 @@ function getWH( elem, name, extra ) { jQuery.each( which, function() { if ( !extra ) { - val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true )) || 0; + val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0; } if ( extra === "margin" ) { - val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true )) || 0; + val += parseFloat(jQuery.css( elem, "margin" + this )) || 0; } else { - val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true )) || 0; + val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0; } }); @@ -240,7 +268,7 @@ if ( jQuery.expr && jQuery.expr.filters ) { true : width > 0 && height > 0 && !skip ? false : - jQuery.css(elem, "display") === "none"; + (elem.style.display || jQuery.css( elem, "display" )) === "none"; }; jQuery.expr.filters.visible = function( elem ) { diff --git a/src/dimensions.js b/src/dimensions.js index d3561e822..698f5f4b0 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // innerHeight and innerWidth jQuery.fn["inner" + name] = function() { return this[0] ? - parseFloat( jQuery.css( this[0], type, undefined, false, "padding" ), 10 ) : + parseFloat( jQuery.css( this[0], type, undefined, "padding" ), 10 ) : null; }; // outerHeight and outerWidth jQuery.fn["outer" + name] = function( margin ) { return this[0] ? - parseFloat( jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ), 10 ) : + parseFloat( jQuery.css( this[0], type, undefined, margin ? "margin" : "border" ), 10 ) : null; }; diff --git a/src/effects.js b/src/effects.js index 4eb725bd9..eeab9b7a9 100644 --- a/src/effects.js +++ b/src/effects.js @@ -29,7 +29,7 @@ jQuery.fn.extend({ this[i].style.display = old || ""; - if ( jQuery.css(this[i], "display") === "none" ) { + if ( jQuery.css( this[i], "display" ) === "none" ) { var nodeName = this[i].nodeName, display; if ( elemdisplay[ nodeName ] ) { @@ -71,7 +71,7 @@ jQuery.fn.extend({ for ( var i = 0, l = this.length; i < l; i++ ) { var old = jQuery.data(this[i], "olddisplay"); if ( !old && old !== "none" ) { - jQuery.data( this[i], "olddisplay", jQuery.css(this[i], "display") ); + jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) ); } } @@ -139,7 +139,7 @@ jQuery.fn.extend({ if ( ( p === "height" || p === "width" ) && this.style ) { // Store display property - opt.display = jQuery.css(this, "display"); + opt.display = this.style.display; // Make sure that nothing sneaks out opt.overflow = this.style.overflow; @@ -316,13 +316,13 @@ jQuery.fx.prototype = { }, // Get the current size - cur: function( force ) { + cur: function() { if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) { return this.elem[ this.prop ]; } - var r = parseFloat(jQuery.css(this.elem, this.prop, undefined, force)); - return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0; + var r = jQuery.css( this.elem, this.prop ); + return r && r > -10000 ? r : 0; }, // Start an animation from one number to another @@ -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, undefined, false ); + this.options.orig[this.prop] = jQuery.style( this.elem, this.prop ); 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, undefined, false ); + this.options.orig[this.prop] = jQuery.style( this.elem, this.prop ); this.options.hide = true; // Begin the animation @@ -397,7 +397,7 @@ jQuery.fx.prototype = { var old = jQuery.data(this.elem, "olddisplay"); this.elem.style.display = old ? old : this.options.display; - if ( jQuery.css(this.elem, "display") === "none" ) { + if ( jQuery.css( this.elem, "display" ) === "none" ) { this.elem.style.display = "block"; } } @@ -410,7 +410,7 @@ jQuery.fx.prototype = { // Reset the properties, if the item has been hidden or shown if ( this.options.hide || this.options.show ) { for ( var p in this.options.curAnim ) { - jQuery.css( this.elem, p, this.options.orig[p] ); + jQuery.style( this.elem, p, this.options.orig[p] ); } } @@ -467,7 +467,7 @@ jQuery.extend( jQuery.fx, { step: { opacity: function( fx ) { - jQuery.css( fx.elem, "opacity", fx.now ); + jQuery.style( fx.elem, "opacity", fx.now ); }, _default: function( fx ) { diff --git a/src/offset.js b/src/offset.js index 5d283aacf..c472f9852 100644 --- a/src/offset.js +++ b/src/offset.js @@ -105,7 +105,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { jQuery.offset = { initialize: function() { - var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0, + var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0, html = "
"; jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } ); @@ -144,8 +144,8 @@ jQuery.offset = { jQuery.offset.initialize(); if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) { - top += parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0; - left += parseFloat( jQuery.css(body, "marginLeft", undefined, true) ) || 0; + top += parseFloat( jQuery.css(body, "marginTop") ) || 0; + left += parseFloat( jQuery.css(body, "marginLeft") ) || 0; } return { top: top, left: left }; @@ -161,8 +161,8 @@ jQuery.offset = { var curElem = jQuery( elem ), curOffset = curElem.offset(), - curCSSTop = jQuery.css( elem, "top", undefined, true ), - curCSSLeft = jQuery.css( elem, "left", undefined, true ), + curCSSTop = jQuery.css( elem, "top" ), + curCSSLeft = jQuery.css( elem, "left" ), calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1), props = {}, curPosition = {}, curTop, curLeft; @@ -212,12 +212,12 @@ jQuery.fn.extend({ // Subtract element margins // note: when an element has margin: auto the offsetLeft and marginLeft // are the same in Safari causing offset.left to incorrectly be 0 - offset.top -= parseFloat( jQuery.css(elem, "marginTop", undefined, true) ) || 0; - offset.left -= parseFloat( jQuery.css(elem, "marginLeft", undefined, true) ) || 0; + offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0; + offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0; // Add offsetParent borders - parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth", undefined, true) ) || 0; - parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth", undefined, true) ) || 0; + parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0; + parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0; // Subtract the two offsets return { diff --git a/test/unit/css.js b/test/unit/css.js index 5f8a74ae4..99bab1fe5 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(30); + expect(28); equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); @@ -19,10 +19,6 @@ test("css(String|Hash)", function() { equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored') equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored') - jQuery('#floatTest').css({styleFloat: 'right'}); - equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right'); - jQuery('#floatTest').css({cssFloat: 'left'}); - equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left'); jQuery('#floatTest').css({'float': 'right'}); equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); jQuery('#floatTest').css({'font-size': '30px'}); @@ -65,7 +61,7 @@ test("css(String|Hash)", function() { }); test("css(String, Object)", function() { - expect(21); + expect(19); ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); jQuery('#nothiddendiv').css("display", 'none'); ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden'); @@ -75,10 +71,6 @@ test("css(String, Object)", function() { jQuery("#nothiddendiv").css("top", "-1em"); ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." ); - jQuery('#floatTest').css('styleFloat', 'left'); - equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); - jQuery('#floatTest').css('cssFloat', 'right'); - equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right'); jQuery('#floatTest').css('float', 'left'); equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left'); jQuery('#floatTest').css('font-size', '20px'); diff --git a/test/unit/effects.js b/test/unit/effects.js index bfd6ff4fc..6129d5d31 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -512,9 +512,9 @@ jQuery.each( { } if ( t_h == "show" ) { - var old_h = jQuery.css(this, "height", undefined, true); + var old_h = jQuery.css(this, "height"); jQuery(this).append("
Some more text
and some more..."); - notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto."); + notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto."); } start(); @@ -532,7 +532,7 @@ jQuery.fn.saveState = function(){ var self = this; self.save = {}; jQuery.each(check, function(i,c){ - self.save[c] = jQuery.css(self,c); + self.save[c] = self.style[ c ] || jQuery.css(self,c); }); }); }; @@ -540,8 +540,8 @@ jQuery.fn.saveState = function(){ jQuery.checkState = function(){ var self = this; jQuery.each(this.save, function(c,v){ - var cur = jQuery.css(self,c); - equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")"); + var cur = self.style[ c ] || jQuery.css(self, c); + equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")"); }); start(); } -- cgit v1.2.3 From 99fcf3babbba8b794fe8b0b2e20d517156cfd4d2 Mon Sep 17 00:00:00 2001 From: John Resig Date: Fri, 17 Sep 2010 13:38:13 -0400 Subject: Fixed some sloppy checks in the effects test suite, makes it more apparent where issues are happening. --- test/unit/effects.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'test/unit') diff --git a/test/unit/effects.js b/test/unit/effects.js index 6129d5d31..32ce583b3 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -475,15 +475,18 @@ jQuery.each( { equals( this.style.display, "block", "Showing, display should block: " + this.style.display); if ( t_w == "hide"||t_w == "show" ) - equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width); + ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width); 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); + ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height); - var cur_o = jQuery.css(this, "opacity"); - if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); + var cur_o = jQuery.style(this, "opacity"); + + if ( cur_o !== "" ) { + cur_o = jQuery.css(this, "opacity"); + } - if ( t_o == "hide"||t_o == "show" ) + if ( t_o == "hide" || t_o == "show" ) equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o); if ( t_w == "hide" ) -- cgit v1.2.3 From 192bab8ed6e8ad2b4c5de0c4660c80b6ecddfd33 Mon Sep 17 00:00:00 2001 From: John Resig Date: Fri, 17 Sep 2010 14:30:30 -0400 Subject: jQuery.css() returns a string value - handle this properly in the animation code. --- src/effects.js | 2 +- test/unit/effects.js | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'test/unit') diff --git a/src/effects.js b/src/effects.js index eeab9b7a9..9c8abe570 100644 --- a/src/effects.js +++ b/src/effects.js @@ -321,7 +321,7 @@ jQuery.fx.prototype = { return this.elem[ this.prop ]; } - var r = jQuery.css( this.elem, this.prop ); + var r = parseFloat( jQuery.css( this.elem, this.prop ), 10 ); return r && r > -10000 ? r : 0; }, diff --git a/test/unit/effects.js b/test/unit/effects.js index 32ce583b3..5ac471157 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -240,11 +240,11 @@ test("stop()", function() { $foo.animate({ width:'show' }, 1000); setTimeout(function(){ var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); setTimeout(function(){ equals( nw, $foo.width(), "The animation didn't continue" ); start(); @@ -266,13 +266,12 @@ test("stop() - several in queue", function() { setTimeout(function(){ equals( $foo.queue().length, 3, "All 3 still in the queue" ); var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); - // Disabled, being flaky - //equals( $foo.queue().length, 1, "The next animation continued" ); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + $foo.stop(true); start(); }, 100); @@ -517,7 +516,7 @@ jQuery.each( { if ( t_h == "show" ) { var old_h = jQuery.css(this, "height"); jQuery(this).append("
Some more text
and some more..."); - notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto."); + notEqual(jQuery.css(this, "height") + "px", old_h, "Make sure height is auto."); } start(); -- cgit v1.2.3