git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added in support for basic JSON object parsing of data- attributes.
[jquery.git]
/
test
/
unit
/
effects.js
diff --git
a/test/unit/effects.js
b/test/unit/effects.js
index
6129d5d
..
5ac4711
100644
(file)
--- 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();
$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();
$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();
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();
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();
$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);
$foo.stop(true);
start();
}, 100);
@@
-475,15
+474,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.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" )
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" )
equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
if ( t_w == "hide" )
@@
-514,7
+516,7
@@
jQuery.each( {
if ( t_h == "show" ) {
var old_h = jQuery.css(this, "height");
jQuery(this).append("<br/>Some more text<br/>and some more...");
if ( t_h == "show" ) {
var old_h = jQuery.css(this, "height");
jQuery(this).append("<br/>Some more text<br/>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();
}
start();