Changeset 3357543

Timestamp:

09/07/2025 09:47:14 PM (7 months ago)

Author:

md10

Message:

removed version 1.2 since it didnt work on live

Location:

custom-smart-modal/trunk

Files:

• admin/settings.php (modified) (2 diffs)
• custom-welcome-modal.php (modified) (5 diffs)
• js/modal.js (modified) (3 diffs)
• readme.txt (modified) (3 diffs)

custom-smart-modal/trunk/admin/settings.php

@@ -425 +425 @@
         plugin_dir_url(dirname(__FILE__)) . 'css/admin-style.css',
         array(),
-        defined('CUSTSMMO_VERSION') ? CUSTSMMO_VERSION : '1.2'
+        defined('CUSTSMMO_VERSION') ? CUSTSMMO_VERSION : '1.1'
     );
 
@@ -433 +433 @@
         plugin_dir_url(__FILE__) . 'js/admin-settings.js',
         array('jquery'),
-        defined('CUSTSMMO_VERSION') ? CUSTSMMO_VERSION : '1.2',
+        defined('CUSTSMMO_VERSION') ? CUSTSMMO_VERSION : '1.1',
         true
     );

custom-smart-modal/trunk/custom-welcome-modal.php

@@ -7 +7 @@
  * Author: Martin Dimitrov
  * Author URI: https://martindimitrov.dk
- * Version: 1.2
+ * Version: 1.1
  * License: GPLv2 or later
  * Text Domain: custom-smart-modal
@@ -17 +17 @@
 
 if ( ! defined( 'CUSTSMMO_VERSION' ) ) {
-    define( 'CUSTSMMO_VERSION', '1.2' );
+    define( 'CUSTSMMO_VERSION', '1.1' );
 }
 
@@ -24 +24 @@
 add_action('wp_head', 'custsmmo_add_preloader_script', 0);
 function custsmmo_add_preloader_script() {
+
     $bg_color = sanitize_hex_color( get_option('custsmmo_bg_color', '#000000') );
     $start_visible = (bool) get_option('custsmmo_start_visible', false);
-    $sentence = get_option('custsmmo_sentence', '');
 
-    // Skip preloader if modal is not visible or no sentence is set
-    if ( ! $start_visible || empty($sentence) ) {
+    if ( ! $start_visible ) {
+        // If modal does NOT start visible, skip preloader
         return;
     }
@@ -35 +35 @@
     // Preloader CSS (inline)
     $preloader_css = "
-    #custsmmo-preloader {position:fixed;top:0;left:0;width:100%;height:100%;background-color:" . esc_attr( $bg_color ?: '#000000' ) . ";z-index:999999;transition:opacity 0.3s ease;}
+    #custsmmo-preloader {position:fixed;top:0;left:0;width:100%;height:100%;background-color:" . esc_attr( $bg_color ?: '#000000' ) . ";z-index:999;}
     .custsmmo-preloader-active {overflow:hidden !important;}
     .custsmmo-preloader-active * {visibility:hidden !important;}
-    #custsmmo-preloader.fade-out {opacity:0;}
     ";
 
@@ -46 +45 @@
     wp_add_inline_style( 'custsmmo-preloader-inline', $preloader_css );
 
-    // Improved preloader JS with smoother transitions
+    // Preloader JS (inline)
     $preloader_js = "(function() {
         try {
-            // Check for internal navigation flag
             if (sessionStorage.getItem('custsmmo_internal_navigation') === 'true') {
                 sessionStorage.removeItem('custsmmo_internal_navigation');
                 return;
             }
-            
-            // Add preloader class to document
             document.documentElement.classList.add('custsmmo-preloader-active');
-            
-            // Create preloader element immediately
-            var preloader = document.createElement('div');
-            preloader.id = 'custsmmo-preloader';
-            document.body ? document.body.appendChild(preloader) : 
-                document.addEventListener('DOMContentLoaded', function() {
+            document.addEventListener('DOMContentLoaded', function() {
+                var preloader = document.getElementById('custsmmo-preloader');
+                if (!preloader) {
+                    preloader = document.createElement('div');
+                    preloader.id = 'custsmmo-preloader';
                     document.body.appendChild(preloader);
-                });
-            
-            // Improved coordination between preloader and modal
-            window.custsmmoPreloaderReady = true;
-            
+                }
+            });
             // Failsafe: auto-remove after 8s
-            setTimeout(function() {
+            setTimeout(function(){
+                var pre = document.getElementById('custsmmo-preloader');
                 document.documentElement.classList.remove('custsmmo-preloader-active');
-                if (preloader.parentNode) {
-                    preloader.classList.add('fade-out');
-                    setTimeout(function() {
-                        if (preloader.parentNode) preloader.parentNode.removeChild(preloader);
-                    }, 300);
-                }
-            }, 8000);
-        } catch(e) {
-            console.error('Custom Smart Modal preloader error:', e);
-        }
+                if (pre) { pre.remove(); }
+            },8000);
+        } catch(e) {}
     })();";
 
-    // Register and enqueue inline script
+    // Register an inline-only script handle and add inline JS in head
+    // explicit version and load in header (in_footer = false) because we add this in wp_head
     wp_register_script( 'custsmmo-preloader-inline', false, array(), CUSTSMMO_VERSION, false );
     wp_enqueue_script( 'custsmmo-preloader-inline' );

custom-smart-modal/trunk/js/modal.js

@@ -5 +5 @@
         document.documentElement.classList.remove('custsmmo-preloader-active');
         var p = document.getElementById('custsmmo-preloader');
-        if (p) {
-            p.classList.add('fade-out');
-            setTimeout(function() { if (p.parentNode) p.parentNode.removeChild(p); }, 300);
-        }
+        if (p) p.remove();
     }, 8000);
 
@@ -19 +16 @@
         const preloader = document.getElementById("custsmmo-preloader");
         if (preloader) {
-            preloader.classList.add('fade-out');
-            setTimeout(function() {
-                if (preloader.parentNode) preloader.parentNode.removeChild(preloader);
-            }, 300);
+            preloader.remove();
         }
         document.documentElement.classList.remove('custsmmo-preloader-active');
@@ -40 +34 @@
     // Function to remove preloader
     function removePreloader() {
-        const preloader = document.getElementById("custsmmo-preloader");
         document.documentElement.classList.remove('custsmmo-preloader-active');
-        
         if (preloader) {
-            // Fade out preloader before removing
-            preloader.classList.add('fade-out');
             setTimeout(function() {
-                if (preloader.parentNode) preloader.parentNode.removeChild(preloader);
                 document.body.classList.add("custsmmo-preloader-remove");
-            }, 300);
-        } else {
+                preloader.remove();
+            }, 100); // Small delay to ensure smooth transition
+        }
+        setTimeout(function() {
             document.body.classList.add("custsmmo-preloader-remove");
-        }
+        }, 150); 
     }
 

custom-smart-modal/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 1.2
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -64 +64 @@
 == Changelog ==
 
-= 1.2 =
-* Fixed preloader so it dosent get triggered on page navigation.
-
 = 1.1 =
 * Minor updates: Updated Delay Before Close default value, added shortcode for settings page under plugins and updated description text.
@@ -74 +71 @@
 
 == Upgrade Notice ==
-
-= 1.2 =
-Plese update to latest version 1.2 to address all new updates.
 
 = 1.1 =