@@ -12,20 +12,20 @@ if (!_.isIE9) {
1212 document . head . appendChild ( cssEl )
1313 }
1414
15- var duration = '50ms'
15+ var duration = 100
1616 insertCSS (
1717 '.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;}'
2020 )
2121 insertCSS ( '.test-enter, .test-leave { opacity: 0; }' )
2222 insertCSS (
2323 '.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 ;}\
2626 .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 ;}\
2929 @keyframes test-enter {\
3030 from { opacity: 0 }\
3131 to { opacity: 1 }}\
@@ -203,7 +203,7 @@ if (!_.isIE9) {
203203 el . __v_trans = new Transition ( el , 'test' , hooks , vm )
204204 // inline style
205205 el . style . transition =
206- el . style . WebkitTransition = 'opacity ' + duration + ' ease'
206+ el . style . WebkitTransition = 'opacity ' + duration + 'ms ease'
207207 transition . applyTransition ( el , 1 , function ( ) {
208208 document . body . appendChild ( el )
209209 op ( )
@@ -231,7 +231,7 @@ if (!_.isIE9) {
231231 circle . __v_trans = new Transition ( circle , 'test' , hooks , vm )
232232 // inline style
233233 circle . style . transition =
234- circle . style . WebkitTransition = 'opacity ' + duration + ' ease'
234+ circle . style . WebkitTransition = 'opacity ' + duration + 'ms ease'
235235 transition . applyTransition ( circle , 1 , function ( ) {
236236 svg . appendChild ( circle )
237237 op ( )
@@ -359,7 +359,7 @@ if (!_.isIE9) {
359359 setTimeout ( function ( ) {
360360 enterDone ( )
361361 testDone ( )
362- } , 100 )
362+ } , duration * 1.5 )
363363 }
364364
365365 el . __v_trans = new Transition ( el , 'test' , hooks , vm )
@@ -402,7 +402,7 @@ if (!_.isIE9) {
402402 setTimeout ( function ( ) {
403403 enterDone ( )
404404 testDone ( )
405- } , 20 )
405+ } , duration / 2 )
406406 }
407407
408408 el . __v_trans = new Transition ( el , 'test' , hooks , vm )
@@ -554,7 +554,7 @@ if (!_.isIE9) {
554554 var leaveSpy = jasmine . createSpy ( 'js leave' )
555555 var timeout
556556 hooks . enter = function ( el , done ) {
557- timeout = setTimeout ( done , 30 )
557+ timeout = setTimeout ( done , duration / 2 )
558558 }
559559 hooks . enterCancelled = function ( ) {
560560 clearTimeout ( timeout )
@@ -573,8 +573,8 @@ if (!_.isIE9) {
573573 setTimeout ( function ( ) {
574574 expect ( cb ) . not . toHaveBeenCalled ( )
575575 done ( )
576- } , 30 )
577- } , 15 )
576+ } , duration / 2 )
577+ } , duration / 4 )
578578 } )
579579 } )
580580 } )
0 commit comments