@@ -18,24 +18,24 @@ function makeStore(): Readable<RouterEvent> {
1818 return derived ( page , ( $page ) => {
1919 return { navigating : false , target_url : $page . url } ;
2020 } ) ;
21- } else {
22- // On client.
23- let current = new URL ( location . href ) ;
21+ }
2422
25- // Return store that responds to navigation events.
26- // The `navigating` store immediately "pushes" `null`.
27- // This in turn causes this derived store to immediately "push" the current URL.
28- return derived ( navigating , ( $nav ) => {
29- let navigating = false ;
30- // $nav is null when navigation finishes.
31- if ( $nav != null && $nav . to != null ) {
32- current = $nav . to . url ;
33- navigating = true ;
34- }
23+ // On client.
24+ let current = new URL ( location . href ) ;
3525
36- return { navigating, target_url : current } ;
37- } ) ;
38- }
26+ // Return store that responds to navigation events.
27+ // The `navigating` store immediately "pushes" `null`.
28+ // This in turn causes this derived store to immediately "push" the current URL.
29+ return derived ( navigating , ( $nav ) => {
30+ let navigating = false ;
31+ // $nav is null when navigation finishes.
32+ if ( $nav != null && $nav . to != null ) {
33+ current = $nav . to . url ;
34+ navigating = true ;
35+ }
36+
37+ return { navigating, target_url : current } ;
38+ } ) ;
3939}
4040
4141// Do not subscribe to it outside of components!
0 commit comments