@@ -12,20 +12,20 @@ if (!_.isIE9) {
12
12
document . head . appendChild ( cssEl )
13
13
}
14
14
15
- var duration = '50ms'
15
+ var duration = 100
16
16
insertCSS (
17
17
'.test {\
18
- transition: opacity ' + duration + ' ease;\
19
- -webkit-transition: opacity ' + duration + ' ease;}'
18
+ transition: opacity ' + duration + 'ms ease;\
19
+ -webkit-transition: opacity ' + duration + 'ms ease;}'
20
20
)
21
21
insertCSS ( '.test-enter, .test-leave { opacity: 0; }' )
22
22
insertCSS (
23
23
'.test-anim-enter {\
24
- animation: test-enter ' + duration + ';\
25
- -webkit-animation: test-enter ' + duration + ';}\
24
+ animation: test-enter ' + duration + 'ms ;\
25
+ -webkit-animation: test-enter ' + duration + 'ms ;}\
26
26
.test-anim-leave {\
27
- animation: test-leave ' + duration + ';\
28
- -webkit-animation: test-leave ' + duration + ';}\
27
+ animation: test-leave ' + duration + 'ms ;\
28
+ -webkit-animation: test-leave ' + duration + 'ms ;}\
29
29
@keyframes test-enter {\
30
30
from { opacity: 0 }\
31
31
to { opacity: 1 }}\
@@ -203,7 +203,7 @@ if (!_.isIE9) {
203
203
el . __v_trans = new Transition ( el , 'test' , hooks , vm )
204
204
// inline style
205
205
el . style . transition =
206
- el . style . WebkitTransition = 'opacity ' + duration + ' ease'
206
+ el . style . WebkitTransition = 'opacity ' + duration + 'ms ease'
207
207
transition . applyTransition ( el , 1 , function ( ) {
208
208
document . body . appendChild ( el )
209
209
op ( )
@@ -231,7 +231,7 @@ if (!_.isIE9) {
231
231
circle . __v_trans = new Transition ( circle , 'test' , hooks , vm )
232
232
// inline style
233
233
circle . style . transition =
234
- circle . style . WebkitTransition = 'opacity ' + duration + ' ease'
234
+ circle . style . WebkitTransition = 'opacity ' + duration + 'ms ease'
235
235
transition . applyTransition ( circle , 1 , function ( ) {
236
236
svg . appendChild ( circle )
237
237
op ( )
@@ -359,7 +359,7 @@ if (!_.isIE9) {
359
359
setTimeout ( function ( ) {
360
360
enterDone ( )
361
361
testDone ( )
362
- } , 100 )
362
+ } , duration * 1.5 )
363
363
}
364
364
365
365
el . __v_trans = new Transition ( el , 'test' , hooks , vm )
@@ -402,7 +402,7 @@ if (!_.isIE9) {
402
402
setTimeout ( function ( ) {
403
403
enterDone ( )
404
404
testDone ( )
405
- } , 20 )
405
+ } , duration / 2 )
406
406
}
407
407
408
408
el . __v_trans = new Transition ( el , 'test' , hooks , vm )
@@ -554,7 +554,7 @@ if (!_.isIE9) {
554
554
var leaveSpy = jasmine . createSpy ( 'js leave' )
555
555
var timeout
556
556
hooks . enter = function ( el , done ) {
557
- timeout = setTimeout ( done , 30 )
557
+ timeout = setTimeout ( done , duration / 2 )
558
558
}
559
559
hooks . enterCancelled = function ( ) {
560
560
clearTimeout ( timeout )
@@ -573,8 +573,8 @@ if (!_.isIE9) {
573
573
setTimeout ( function ( ) {
574
574
expect ( cb ) . not . toHaveBeenCalled ( )
575
575
done ( )
576
- } , 30 )
577
- } , 15 )
576
+ } , duration / 2 )
577
+ } , duration / 4 )
578
578
} )
579
579
} )
580
580
} )
0 commit comments