fix conflicts properly 🙈
This commit is contained in:
parent
a8ccd94faa
commit
2995ad674d
@ -595,7 +595,7 @@ class App(MiddlewareMixin, LifespanMixin):
|
|||||||
|
|
||||||
Args:
|
Args:
|
||||||
route: The route of the page to compile.
|
route: The route of the page to compile.
|
||||||
save_page: If True, the compiled page is saved to self.pages.
|
save_page: If True, the compiled page is saved to self._pages.
|
||||||
"""
|
"""
|
||||||
component, enable_state = compiler.compile_unevaluated_page(
|
component, enable_state = compiler.compile_unevaluated_page(
|
||||||
route, self._unevaluated_pages[route], self._state, self.style, self.theme
|
route, self._unevaluated_pages[route], self._state, self.style, self.theme
|
||||||
@ -607,7 +607,7 @@ class App(MiddlewareMixin, LifespanMixin):
|
|||||||
# Add the page.
|
# Add the page.
|
||||||
self._check_routes_conflict(route)
|
self._check_routes_conflict(route)
|
||||||
if save_page:
|
if save_page:
|
||||||
self.pages[route] = component
|
self._pages[route] = component
|
||||||
|
|
||||||
def get_load_events(self, route: str) -> list[IndividualEventType[[], Any]]:
|
def get_load_events(self, route: str) -> list[IndividualEventType[[], Any]]:
|
||||||
"""Get the load events for a route.
|
"""Get the load events for a route.
|
||||||
@ -912,7 +912,7 @@ class App(MiddlewareMixin, LifespanMixin):
|
|||||||
|
|
||||||
should_compile = self._should_compile()
|
should_compile = self._should_compile()
|
||||||
|
|
||||||
for route in self.unevaluated_pages:
|
for route in self._unevaluated_pages:
|
||||||
console.debug(f"Evaluating page: {route}")
|
console.debug(f"Evaluating page: {route}")
|
||||||
self._compile_page(route, save_page=should_compile)
|
self._compile_page(route, save_page=should_compile)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user