Skip to content

Commit 7c9b7cf

Browse files
committed
improving the animation tests slightly
1 parent 60199ce commit 7c9b7cf

File tree

2 files changed

+149
-2
lines changed

2 files changed

+149
-2
lines changed

dom/animate/animate_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ steal('jquery',
66
setup: function(){
77
// make qunit-fixture something else
88
$("#qunit-fixture").prop("id","outer-qunit-fixture")
9-
.replaceWith(fixtureHTML);
9+
.html(fixtureHTML);
1010
},
1111
teardown: function(){
1212
$("#outer-qunit-fixture").empty().prop("id","qunit-fixture");
@@ -38,7 +38,7 @@ steal('jquery',
3838
reset();
3939

4040
hiddendiv = jQuery("div.hidden");
41-
41+
4242
equal($.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
4343

4444
hiddendiv.css("display", "block");

dom/animate/test/fixture.html

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,150 @@
1+
<!-- a combination of the styles and elements from jQuery 1.8's tests -->
2+
<style>
3+
ol#empty {
4+
opacity: 0;
5+
}
6+
7+
div#fx-tests h4 {
8+
background: red;
9+
}
10+
11+
div#fx-tests h4.pass {
12+
background: green;
13+
}
14+
15+
div#fx-tests div.box {
16+
background: red;
17+
overflow: hidden;
18+
border: 2px solid #000;
19+
}
20+
21+
div#fx-tests div.overflow {
22+
overflow: visible;
23+
}
24+
25+
div.inline {
26+
display: inline;
27+
}
28+
29+
div.autoheight {
30+
height: auto;
31+
}
32+
33+
div.autowidth {
34+
width: auto;
35+
}
36+
37+
div.autoopacity {
38+
opacity: 1;
39+
}
40+
41+
div.largewidth {
42+
width: 100px;
43+
}
44+
45+
div.largeheight {
46+
height: 100px;
47+
}
48+
49+
div.medwidth {
50+
width: 50px;
51+
}
52+
53+
div.medheight {
54+
height: 50px;
55+
}
56+
57+
div.medopacity {
58+
opacity: 0.5;
59+
}
60+
61+
div.nowidth {
62+
width: 0px;
63+
}
64+
65+
div.noheight {
66+
height: 0px;
67+
}
68+
69+
div.noopacity {
70+
opacity: 0;
71+
}
72+
73+
div.hidden {
74+
display: none;
75+
}
76+
77+
div#fx-tests div.widewidth {
78+
background-repeat: repeat-x;
79+
}
80+
81+
div#fx-tests div.wideheight {
82+
background-repeat: repeat-y;
83+
}
84+
85+
div#fx-tests div.widewidth.wideheight {
86+
background-repeat: repeat;
87+
}
88+
89+
div#fx-tests div.noback {
90+
background-image: none;
91+
}
92+
93+
.chain-test,
94+
.chain-test div {
95+
width: 100px;
96+
height: 20px;
97+
position: relative;
98+
float: left;
99+
}
100+
.chain-test div {
101+
position: absolute;
102+
top: 0;
103+
left: 0;
104+
}
105+
106+
.chain-test {
107+
background: red;
108+
}
109+
.chain-test div {
110+
background: green;
111+
}
112+
113+
.chain-test-out {
114+
background: green;
115+
}
116+
.chain-test-out div {
117+
background: red;
118+
display: none;
119+
}
120+
121+
/* tests to ensure jQuery can determine the native display mode of elements
122+
that have been set as display: none in stylesheets */
123+
div#show-tests * { display: none; }
124+
125+
#nothiddendiv { font-size: 16px; }
126+
#nothiddendivchild.em { font-size: 2em; }
127+
#nothiddendivchild.prct { font-size: 150%; }
128+
129+
/* 8099 changes to default styles are read correctly */
130+
tt { display: none; }
131+
sup { display: none; }
132+
dfn { display: none; }
133+
134+
/* #9239 Attach a background to the body( avoid crashes in removing the test element in support ) */
135+
body, div { background: url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif) no-repeat -1000px 0; }
136+
137+
/* #10501 */
138+
section { background:#f0f; display:block; }
139+
140+
/* #11971 */
141+
#foo { background: url(1x1.jpg) right bottom no-repeat; }
142+
143+
/* #14824 */
144+
#span-14824 { display: block; }
145+
146+
#display { display: list-item !important; }
147+
</style>
1148
<!-- Test HTML -->
2149
<div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv">
3150
<div id="nothiddendivchild"></div>

0 commit comments

Comments
 (0)