From 3e9dbac21de168b9875a2144d516a9dec243c29f Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Fri, 20 Oct 2023 00:49:11 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20context=20operation=20f?= =?UTF-8?q?or=20adding=20base=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop-bootsier/src/lib.rs | 2 +- pagetop-bulmix/src/lib.rs | 2 +- pagetop/src/base/theme/inception.rs | 2 +- pagetop/src/core/component/context.rs | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index 081e3f18..de98e6cb 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -110,7 +110,7 @@ impl ThemeTrait for Bootsier { .with_version("5.1.3") .with_weight(-99), )) - .alter_context(ContextOp::AddAssetsForBase); + .alter_context(ContextOp::AddBaseAssets); } fn render_component(&self, component: &dyn ComponentTrait, cx: &mut Context) -> Option { diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs index 94f81de6..65c5f7a9 100644 --- a/pagetop-bulmix/src/lib.rs +++ b/pagetop-bulmix/src/lib.rs @@ -28,7 +28,7 @@ impl ThemeTrait for Bulmix { .with_version("0.9.4") .with_weight(-99), )) - .alter_context(ContextOp::AddAssetsForBase); + .alter_context(ContextOp::AddBaseAssets); } #[rustfmt::skip] diff --git a/pagetop/src/base/theme/inception.rs b/pagetop/src/base/theme/inception.rs index 126b6f92..7a02b2c0 100644 --- a/pagetop/src/base/theme/inception.rs +++ b/pagetop/src/base/theme/inception.rs @@ -32,7 +32,7 @@ impl ThemeTrait for Inception { .with_version("8.0.1") .with_weight(-90), )) - .alter_context(ContextOp::AddAssetsForBase) + .alter_context(ContextOp::AddBaseAssets) .alter_context(ContextOp::AddStyleSheet( StyleSheet::at("/base/css/styles.css") .with_version("0.0.1") diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/core/component/context.rs index 17ff7829..8b935a74 100644 --- a/pagetop/src/core/component/context.rs +++ b/pagetop/src/core/component/context.rs @@ -1,4 +1,4 @@ -use crate::base::component::add_assets_for_base; +use crate::base::component::add_base_assets; use crate::core::theme::all::{theme_by_single_name, THEME}; use crate::core::theme::ThemeRef; use crate::html::{html, Assets, HeadScript, HeadStyles, JavaScript, Markup, StyleSheet}; @@ -24,8 +24,8 @@ pub enum ContextOp { // Scripts in head. AddHeadScript(HeadScript), RemoveHeadScript(&'static str), - // Add assets to properly use the base components. - AddAssetsForBase, + // Add assets to properly use base components. + AddBaseAssets, } #[rustfmt::skip] @@ -80,8 +80,8 @@ impl Context { ContextOp::AddHeadScript(script) => { self.headscript.add(script); } ContextOp::RemoveHeadScript(path) => { self.headscript.remove(path); } - // Add assets to properly use the base components. - ContextOp::AddAssetsForBase => { add_assets_for_base(self); } + // Add assets to properly use base components. + ContextOp::AddBaseAssets => { add_base_assets(self); } } self }