Changeset 3431056

Timestamp:

01/02/2026 01:27:39 PM (7 weeks ago)

Author:

spelhubben

Message:

Update to version 1.8.5 from GitHub

Location:

spelhubben-weather

Files:

• tags/1.8.5 (copied) (copied from spelhubben-weather/trunk)
• tags/1.8.5/.distignore (modified) (1 diff)
• tags/1.8.5/assets/.htaccess (added)
• tags/1.8.5/assets/icons/spelhubben-weather_banner.jpg (deleted)
• tags/1.8.5/assets/icons/spelhubben-weather_banner2.jpg (deleted)
• tags/1.8.5/assets/icons/spelhubben-weather_icon.png (deleted)
• tags/1.8.5/includes/class-assets.php (modified) (2 diffs)
• trunk/.distignore (modified) (1 diff)
• trunk/assets/.htaccess (added)
• trunk/assets/icons/spelhubben-weather_banner.jpg (deleted)
• trunk/assets/icons/spelhubben-weather_banner2.jpg (deleted)
• trunk/assets/icons/spelhubben-weather_icon.png (deleted)
• trunk/includes/class-assets.php (modified) (2 diffs)

spelhubben-weather/tags/1.8.5/.distignore

@@ -7 +7 @@
 .editorconfig
 .vs/
-Patch & Fix/
+PatchFix/
+.wordpress-org/
 
 # ---- Node/Composer ----

spelhubben-weather/tags/1.8.5/includes/class-assets.php

@@ -7 +7 @@
     /**
      * Enqueue public-facing assets (CSS/JS) for the frontend.
+     * Only loads core stylesheet; Leaflet/map assets are loaded conditionally via filters.
      */
     public function enqueue_public_assets() {
-        // Core plugin stylesheet
+        // Core plugin stylesheet - always load
         wp_enqueue_style('sv-vader-style', SV_VADER_URL . 'assets/style.css', [], SV_VADER_VER);
 
-        // Leaflet (bundled locally)
+        // Register Leaflet and map assets but don't auto-enqueue
+        // They will be enqueued conditionally via has_shortcode() or block detection
         wp_register_style('leaflet-css', SV_VADER_URL . 'assets/vendor/leaflet/leaflet.css', [], '1.9.4');
-        wp_enqueue_style('leaflet-css');
-
         wp_register_script('leaflet-js', SV_VADER_URL . 'assets/vendor/leaflet/leaflet.js', [], '1.9.4', true);
-        wp_enqueue_script('leaflet-js');
-
-        // Map logic (depends on Leaflet)
         wp_register_script('sv-vader-map', SV_VADER_URL . 'assets/map.js', ['leaflet-js'], SV_VADER_VER, true);
 
@@ -27 +24 @@
         ]);
 
-        wp_enqueue_script('sv-vader-map');
+        // Load Leaflet assets only if shortcode is present or Gutenberg block is used
+        if ( $this->should_load_leaflet() ) {
+            wp_enqueue_style('leaflet-css');
+            wp_enqueue_script('leaflet-js');
+            wp_enqueue_script('sv-vader-map');
+        }
+    }
+
+    /**
+     * Check if Leaflet assets should be loaded on this page.
+     */
+    private function should_load_leaflet() {
+        global $post;
+
+        if ( ! isset( $post->post_content ) ) {
+            return false;
+        }
+
+        // Check for shortcode
+        if ( has_shortcode( $post->post_content, 'sv-vader' ) ) {
+            return true;
+        }
+
+        // Check for Gutenberg block
+        if ( has_block( 'spelhubben-weather/spelhubben-weather', $post ) ) {
+            return true;
+        }
+
+        return false;
     }
 }

spelhubben-weather/trunk/.distignore

@@ -7 +7 @@
 .editorconfig
 .vs/
-Patch & Fix/
+PatchFix/
+.wordpress-org/
 
 # ---- Node/Composer ----

spelhubben-weather/trunk/includes/class-assets.php

@@ -7 +7 @@
     /**
      * Enqueue public-facing assets (CSS/JS) for the frontend.
+     * Only loads core stylesheet; Leaflet/map assets are loaded conditionally via filters.
      */
     public function enqueue_public_assets() {
-        // Core plugin stylesheet
+        // Core plugin stylesheet - always load
         wp_enqueue_style('sv-vader-style', SV_VADER_URL . 'assets/style.css', [], SV_VADER_VER);
 
-        // Leaflet (bundled locally)
+        // Register Leaflet and map assets but don't auto-enqueue
+        // They will be enqueued conditionally via has_shortcode() or block detection
         wp_register_style('leaflet-css', SV_VADER_URL . 'assets/vendor/leaflet/leaflet.css', [], '1.9.4');
-        wp_enqueue_style('leaflet-css');
-
         wp_register_script('leaflet-js', SV_VADER_URL . 'assets/vendor/leaflet/leaflet.js', [], '1.9.4', true);
-        wp_enqueue_script('leaflet-js');
-
-        // Map logic (depends on Leaflet)
         wp_register_script('sv-vader-map', SV_VADER_URL . 'assets/map.js', ['leaflet-js'], SV_VADER_VER, true);
 
@@ -27 +24 @@
         ]);
 
-        wp_enqueue_script('sv-vader-map');
+        // Load Leaflet assets only if shortcode is present or Gutenberg block is used
+        if ( $this->should_load_leaflet() ) {
+            wp_enqueue_style('leaflet-css');
+            wp_enqueue_script('leaflet-js');
+            wp_enqueue_script('sv-vader-map');
+        }
+    }
+
+    /**
+     * Check if Leaflet assets should be loaded on this page.
+     */
+    private function should_load_leaflet() {
+        global $post;
+
+        if ( ! isset( $post->post_content ) ) {
+            return false;
+        }
+
+        // Check for shortcode
+        if ( has_shortcode( $post->post_content, 'sv-vader' ) ) {
+            return true;
+        }
+
+        // Check for Gutenberg block
+        if ( has_block( 'spelhubben-weather/spelhubben-weather', $post ) ) {
+            return true;
+        }
+
+        return false;
     }
 }