manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

💥 Simplifica renderizado de estilos y javascripts

Browse source 
Elimina la necesidad de incluir la versión como un campo más del activo.
Será buena práctica de los desarrolladores incluir la versión
("?v=X.Y.Z") en la propia localización del activo, ya sea una hoja de
estilos o un archivo JavaScript.
This commit is contained in:
Manuel Cillero 2023-06-26 22:27:00 +02:00
parent e033630d2a
commit ea782f820d
2 changed files with 2 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pagetop/src/html/assets/javascript.rs
View file

@ -13,8 +13,6 @@ pub enum ModeJS {
#[derive(Default)] #[derive(Default)]
pub struct JavaScript { pub struct JavaScript {
source : String, source : String,
prefix : &'static str,
version: &'static str,
weight : isize, weight : isize,
mode : ModeJS, mode : ModeJS,
} }
@ -31,7 +29,7 @@ impl AssetsTrait for JavaScript {
fn prepare(&self) -> Markup { fn prepare(&self) -> Markup {
html! { html! {
script type="text/javascript" script type="text/javascript"
src=(crate::concat_string!(self.source, self.prefix, self.version)) src=(self.source)
async[self.mode == ModeJS::Async] async[self.mode == ModeJS::Async]
defer[self.mode == ModeJS::Defer] defer[self.mode == ModeJS::Defer]
{}; {};
@ -50,15 +48,6 @@ impl JavaScript {
} }
} }
pub fn with_version(mut self, version: &'static str) -> Self {
(self.prefix, self.version) = if version.is_empty() {
("", "")
} else {
("?ver=", version)
};
self
}
pub fn with_weight(mut self, weight: isize) -> Self { pub fn with_weight(mut self, weight: isize) -> Self {
self.weight = weight; self.weight = weight;
self self

18
pagetop/src/html/assets/stylesheet.rs
View file

@ -12,8 +12,6 @@ pub enum TargetMedia {
#[derive(Default)] #[derive(Default)]
pub struct StyleSheet { pub struct StyleSheet {
source : String, source : String,
prefix : &'static str,
version: &'static str,
media : Option<&'static str>, media : Option<&'static str>,
weight : isize, weight : isize,
} }
@ -28,12 +26,7 @@ impl AssetsTrait for StyleSheet {
} }
fn prepare(&self) -> Markup { fn prepare(&self) -> Markup {
html! { html! { link rel="stylesheet" href=(self.source) media=[self.media]; }
link
rel="stylesheet"
href=(crate::concat_string!(self.source, self.prefix, self.version))
media=[self.media];
}
} }
} }
@ -48,15 +41,6 @@ impl StyleSheet {
} }
} }
pub fn with_version(mut self, version: &'static str) -> Self {
(self.prefix, self.version) = if version.is_empty() {
("", "")
} else {
("?ver=", version)
};
self
}
pub fn with_weight(mut self, weight: isize) -> Self { pub fn with_weight(mut self, weight: isize) -> Self {
self.weight = weight; self.weight = weight;
self self