@@ -20,11 +20,10 @@ if (!isIE9) {
20
20
it ( 'dynamic components, simultaneous' , done => {
21
21
const vm = new Vue ( {
22
22
template : `<div>
23
- <component
24
- :is="view"
25
- class="test"
26
- transition>
27
- </component>
23
+ <transition>
24
+ <component :is="view" class="test">
25
+ </component>
26
+ </transition>
28
27
</div>` ,
29
28
data : { view : 'one' } ,
30
29
components
@@ -33,13 +32,13 @@ if (!isIE9) {
33
32
vm . view = 'two'
34
33
waitForUpdate ( ( ) => {
35
34
expect ( vm . $el . innerHTML ) . toBe (
36
- '<div class="test v-enter v-enter -active">two </div>' +
37
- '<div class="test v-leave v-leave -active">one </div>'
35
+ '<div class="test v-leave v-leave -active">one </div>' +
36
+ '<div class="test v-enter v-enter -active">two </div>'
38
37
)
39
38
} ) . thenWaitFor ( nextFrame ) . then ( ( ) => {
40
39
expect ( vm . $el . innerHTML ) . toBe (
41
- '<div class="test v-enter -active">two </div>' +
42
- '<div class="test v-leave -active">one </div>'
40
+ '<div class="test v-leave -active">one </div>' +
41
+ '<div class="test v-enter -active">two </div>'
43
42
)
44
43
} ) . thenWaitFor ( duration + 10 ) . then ( ( ) => {
45
44
expect ( vm . $el . innerHTML ) . toBe (
@@ -52,20 +51,16 @@ if (!isIE9) {
52
51
let next
53
52
const vm = new Vue ( {
54
53
template : `<div>
55
- <component
56
- :is="view"
57
- class="test"
58
- transition="test"
59
- transition-mode="out-in">
60
- </component>
54
+ <transition name="test" mode="out-in" @after-leave="afterLeave">
55
+ <component :is="view" class="test">
56
+ </component>
57
+ </transition>
61
58
</div>` ,
62
59
data : { view : 'one' } ,
63
60
components,
64
- transitions : {
65
- test : {
66
- afterLeave ( ) {
67
- next ( )
68
- }
61
+ methods : {
62
+ afterLeave ( ) {
63
+ next ( )
69
64
}
70
65
}
71
66
} ) . $mount ( el )
@@ -100,20 +95,16 @@ if (!isIE9) {
100
95
let next
101
96
const vm = new Vue ( {
102
97
template : `<div>
103
- <component
104
- :is="view"
105
- class="test"
106
- transition="test"
107
- transition-mode="in-out">
108
- </component>
98
+ <transition name="test" mode="in-out" @after-enter="afterEnter">
99
+ <component :is="view" class="test">
100
+ </component>
101
+ </transition>
109
102
</div>` ,
110
103
data : { view : 'one' } ,
111
104
components,
112
- transitions : {
113
- test : {
114
- afterEnter ( ) {
115
- next ( )
116
- }
105
+ methods : {
106
+ afterEnter ( ) {
107
+ next ( )
117
108
}
118
109
}
119
110
} ) . $mount ( el )
@@ -154,10 +145,9 @@ if (!isIE9) {
154
145
it ( 'normal elements with different keys, simultaneous' , done => {
155
146
const vm = new Vue ( {
156
147
template : `<div>
157
- <div
158
- :key="view"
159
- class="test"
160
- transition>{{view}}</div>
148
+ <transition>
149
+ <div :key="view" class="test">{{view}}</div>
150
+ </transition>
161
151
</div>` ,
162
152
data : { view : 'one' } ,
163
153
components
@@ -166,13 +156,13 @@ if (!isIE9) {
166
156
vm . view = 'two'
167
157
waitForUpdate ( ( ) => {
168
158
expect ( vm . $el . innerHTML ) . toBe (
169
- '<div class="test v-enter v-enter -active">two </div>' +
170
- '<div class="test v-leave v-leave -active">one </div>'
159
+ '<div class="test v-leave v-leave -active">one </div>' +
160
+ '<div class="test v-enter v-enter -active">two </div>'
171
161
)
172
162
} ) . thenWaitFor ( nextFrame ) . then ( ( ) => {
173
163
expect ( vm . $el . innerHTML ) . toBe (
174
- '<div class="test v-enter -active">two </div>' +
175
- '<div class="test v-leave -active">one </div>'
164
+ '<div class="test v-leave -active">one </div>' +
165
+ '<div class="test v-enter -active">two </div>'
176
166
)
177
167
} ) . thenWaitFor ( duration + 10 ) . then ( ( ) => {
178
168
expect ( vm . $el . innerHTML ) . toBe (
@@ -185,19 +175,15 @@ if (!isIE9) {
185
175
let next
186
176
const vm = new Vue ( {
187
177
template : `<div>
188
- <div
189
- :key="view"
190
- class="test"
191
- transition="test"
192
- transition-mode="out-in">{{view}}</div>
178
+ <transition name="test" mode="out-in" @after-leave="afterLeave">
179
+ <div :key="view" class="test">{{view}}</div>
180
+ </transition>
193
181
</div>` ,
194
182
data : { view : 'one' } ,
195
183
components,
196
- transitions : {
197
- test : {
198
- afterLeave ( ) {
199
- next ( )
200
- }
184
+ methods : {
185
+ afterLeave ( ) {
186
+ next ( )
201
187
}
202
188
}
203
189
} ) . $mount ( el )
@@ -232,19 +218,15 @@ if (!isIE9) {
232
218
let next
233
219
const vm = new Vue ( {
234
220
template : `<div>
235
- <div
236
- :key="view"
237
- class="test"
238
- transition="test"
239
- transition-mode="in-out">{{view}}</div>
221
+ <transition name="test" mode="in-out" @after-enter="afterEnter">
222
+ <div :key="view" class="test">{{view}}</div>
223
+ </transition>
240
224
</div>` ,
241
225
data : { view : 'one' } ,
242
226
components,
243
- transitions : {
244
- test : {
245
- afterEnter ( ) {
246
- next ( )
247
- }
227
+ methods : {
228
+ afterEnter ( ) {
229
+ next ( )
248
230
}
249
231
}
250
232
} ) . $mount ( el )
0 commit comments