Rename hasDeferredRedirect to hasPreRedirect

ije · ije · commit ac7fa09592ca · 2021-04-20T00:34:29.000+08:00
diff --git a/framework/core/redirect.ts b/framework/core/redirect.ts
@@ -3,11 +3,11 @@ import events from './events.ts'
 
 const routerState = {
   ready: false,
-  hasDeferredRedirect: false,
+  hasPreRedirect: false,
 }
 
 events.once('routerstate', state => {
-  if (routerState.hasDeferredRedirect) {
+  if (routerState.hasPreRedirect) {
     events.emit('popstate', { type: 'popstate', resetScroll: true })
   }
   Object.assign(routerState, state)
@@ -34,7 +34,7 @@ export async function redirect(url: string, replace?: boolean) {
 
   if (routerState.ready) {
     events.emit('popstate', { type: 'popstate', resetScroll: true })
-  } else if (!routerState.hasDeferredRedirect) {
-    routerState.hasDeferredRedirect = true
+  } else if (!routerState.hasPreRedirect) {
+    routerState.hasPreRedirect = true
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ import events from './events.ts'`
`3`	`3`
`4`	`4`	`const routerState = {`
`5`	`5`	`ready: false,`
`6`		`- hasDeferredRedirect: false,`
	`6`	`+ hasPreRedirect: false,`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`events.once('routerstate', state => {`
`10`		`- if (routerState.hasDeferredRedirect) {`
	`10`	`+ if (routerState.hasPreRedirect) {`
`11`	`11`	`events.emit('popstate', { type: 'popstate', resetScroll: true })`
`12`	`12`	`}`
`13`	`13`	`Object.assign(routerState, state)`
`@@ -34,7 +34,7 @@ export async function redirect(url: string, replace?: boolean) {`
`34`	`34`
`35`	`35`	`if (routerState.ready) {`
`36`	`36`	`events.emit('popstate', { type: 'popstate', resetScroll: true })`
`37`		`- } else if (!routerState.hasDeferredRedirect) {`
`38`		`- routerState.hasDeferredRedirect = true`
	`37`	`+ } else if (!routerState.hasPreRedirect) {`
	`38`	`+ routerState.hasPreRedirect = true`
`39`	`39`	`}`
`40`	`40`	`}`