#464411- FIx loaderStopInit

hlxsites · May 28, 2024 · b9bd59e · b9bd59e
1 parent d6d46ca
commit b9bd59e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/blocks/footer/footer.js b/blocks/footer/footer.js
@@ -7,7 +7,7 @@ export default class Footer extends ComponentBase {
   static loaderConfig = {
     ...ComponentBase.loaderConfig,
     loaderStopInit() {
-      return metaFragment === false;
+      return metaFooter === false;
     },
   };
 

diff --git a/head.html b/head.html
@@ -13,7 +13,7 @@
 
       const headerMeta = document.querySelector('meta[name="header"]');
       const url = headerMeta?.content.trim();
-      if (url.toLowerCase() !== 'false') {
+      if (url?.toLowerCase() !== 'false') {
         const link = document.createElement('link');
         link.setAttribute('rel', 'preload');
         link.setAttribute('as', 'fetch');

diff --git a/scripts/component-loader.js b/scripts/component-loader.js
@@ -58,7 +58,8 @@ export default class ComponentLoader {
     const { loaded, error } = await this.loadAndDefine();
     if (!loaded) throw error;
     this.setHandlerType();
-    if (await this.Handler?.loaderStopInit?.()) return [];
+    this.loaderConfig = deepMerge({}, this.Handler.loaderConfig, this.loaderConfig);
+    if (await this.loaderConfig?.loaderStopInit?.()) return [];
     if (!this.targets?.length) return [];
 
     this.setTargets();
@@ -140,7 +141,6 @@ export default class ComponentLoader {
   }
 
   setTargets() {
-    this.loaderConfig = deepMerge({}, this.Handler.loaderConfig, this.loaderConfig);
     const { targetsSelectorsPrefix, targetsSelectors, targetsSelectorsLimit, targetsAsContainers, selectorTest } =
       this.loaderConfig;
     const selector = `${targetsSelectorsPrefix || ''} ${targetsSelectors}`;