]> source.dussan.org Git - jquery.git/commitdiff
Fixed some sloppy checks in the effects test suite, makes it more apparent where...
authorJohn Resig <jeresig@gmail.com>
Fri, 17 Sep 2010 17:38:13 +0000 (13:38 -0400)
committerJohn Resig <jeresig@gmail.com>
Fri, 17 Sep 2010 17:38:13 +0000 (13:38 -0400)
test/unit/effects.js

index 6129d5d319998553286349bfe10447a5c3bf2b6d..32ce583b303cc6774f7a91f69bed94a40751468a 100644 (file)
@@ -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" )