@@ -54,11 +54,9 @@ function updateTitle(nextPage: { id: string; display?: string }): void {
5454async function showSyncLoading ( {
5555 loadingOptions,
5656 totalDuration,
57- easingMethod,
5857} : {
5958 loadingOptions : LoadingOptions [ ] ;
6059 totalDuration : number ;
61- easingMethod : Misc . JQueryEasing ;
6260} ) : Promise < void > {
6361 PageLoading . page . element . removeClass ( "hidden" ) . css ( "opacity" , 0 ) ;
6462 await PageLoading . page . beforeShow ( { } ) ;
@@ -67,14 +65,10 @@ async function showSyncLoading({
6765 const fillOffset = 100 / fillDivider ;
6866
6967 //void here to run the loading promise as soon as possible
70- void Misc . promiseAnimation (
71- PageLoading . page . element ,
72- {
73- opacity : "1" ,
74- } ,
75- totalDuration / 2 ,
76- easingMethod
77- ) ;
68+ void Misc . promiseAnimate ( PageLoading . page . element [ 0 ] as HTMLElement , {
69+ opacity : "1" ,
70+ duration : totalDuration / 2 ,
71+ } ) ;
7872
7973 for ( let i = 0 ; i < loadingOptions . length ; i ++ ) {
8074 const currentOffset = fillOffset * i ;
@@ -102,14 +96,10 @@ async function showSyncLoading({
10296 }
10397 }
10498
105- await Misc . promiseAnimation (
106- PageLoading . page . element ,
107- {
108- opacity : "0" ,
109- } ,
110- totalDuration / 2 ,
111- easingMethod
112- ) ;
99+ await Misc . promiseAnimate ( PageLoading . page . element [ 0 ] as HTMLElement , {
100+ opacity : "0" ,
101+ duration : totalDuration / 2 ,
102+ } ) ;
113103
114104 await PageLoading . page . afterHide ( ) ;
115105 PageLoading . page . element . addClass ( "hidden" ) ;
@@ -208,7 +198,6 @@ export async function change(
208198 const previousPage = pages [ ActivePage . get ( ) ] ;
209199 const nextPage = pages [ pageName ] ;
210200 const totalDuration = Misc . applyReducedMotion ( 250 ) ;
211- const easingMethod : Misc . JQueryEasing = "swing" ;
212201
213202 //start
214203 PageTransition . set ( true ) ;
@@ -217,14 +206,10 @@ export async function change(
217206 //previous page
218207 await previousPage ?. beforeHide ?.( ) ;
219208 previousPage . element . removeClass ( "hidden" ) . css ( "opacity" , 1 ) ;
220- await Misc . promiseAnimation (
221- previousPage . element ,
222- {
223- opacity : "0" ,
224- } ,
225- totalDuration / 2 ,
226- easingMethod
227- ) ;
209+ await Misc . promiseAnimate ( previousPage . element [ 0 ] as HTMLElement , {
210+ opacity : "0" ,
211+ duration : totalDuration / 2 ,
212+ } ) ;
228213 previousPage . element . addClass ( "hidden" ) ;
229214 await previousPage ?. afterHide ( ) ;
230215
@@ -245,7 +230,6 @@ export async function change(
245230 await showSyncLoading ( {
246231 loadingOptions : syncLoadingOptions ,
247232 totalDuration,
248- easingMethod,
249233 } ) ;
250234 }
251235
@@ -297,14 +281,10 @@ export async function change(
297281 }
298282
299283 nextPage . element . removeClass ( "hidden" ) . css ( "opacity" , 0 ) ;
300- await Misc . promiseAnimation (
301- nextPage . element ,
302- {
303- opacity : "1" ,
304- } ,
305- totalDuration / 2 ,
306- easingMethod
307- ) ;
284+ await Misc . promiseAnimate ( nextPage . element [ 0 ] as HTMLElement , {
285+ opacity : "1" ,
286+ duration : totalDuration / 2 ,
287+ } ) ;
308288 nextPage . element . addClass ( "active" ) ;
309289 await nextPage ?. afterShow ( ) ;
310290
0 commit comments