Changeset 2618042

Timestamp:

10/21/2021 10:41:48 PM (4 years ago)

Author:

scriptcoil

Message:

## [1.0.7] - 2021-10-22
### Support WordPress 5.8

• Supporting until the latest version of WordPress 5.8
• Fixed z-index issue, works with woocommerce quick previews as well.
• Appreciate @mdmosharofsk for helping solve the bug

Location:

sticky-header-oceanwp/trunk

Files:

• LICENSE (added)
• changelog.md (added)
• languages/sticky-header-oceanwp-fr_FR.mo (added)
• languages/sticky-header-oceanwp-fr_FR.po (added)
• main.js (modified) (3 diffs)
• readme.md (added)
• readme.txt (deleted)
• sticky-header-oceanwp.php (modified) (4 diffs)

sticky-header-oceanwp/trunk/main.js

@@ -2 +2 @@
     
     var orginal_height = typeof(orginal_height==='undefined') || $('body').hasClass('fixed_sticky_active')==false ? $('#site-logo-inner').height() : orginal_height;
-    $(window).scroll(function(){
-        sticky_header_oceanwp();
-    });
-    sticky_header_oceanwp();
-    
+
     function sticky_header_oceanwp(){       
         
         var style = typeof(sticky_header_style) !== 'undefined' && sticky_header_style == 'shrink' ? 'shrink' : 'float';
 
-            var site_header = $('#site-header');
-            var wpadmin_height = $('#wpadminbar').css('position') == 'fixed' && $('#wpadminbar').height() > 0 ? $('#wpadminbar').height() : 0;
-            var top_bars = $('#wpadminbar').css('position') == 'fixed' ? $('#top-bar-wrap').height() : $('#top-bar-wrap').height() + $('#wpadminbar').height();
-            var header_status = $(window).scrollTop() >= top_bars;
-            var header_padding = site_header.height();
-            
-            if (style == 'float'){
-
-            
-            if (!header_status){
-                site_header.css({
-                    'position': 'relative',
-                    'top': '0',
-                });
-                site_header.next().css('margin-top', '0');
-            }else{
-                site_header.css({
-                    'position': 'fixed',
-                    'top': wpadmin_height,
-                    'width': '100%',
-                    'z-index': '99999',
-                });
-                site_header.next().css('margin-top', header_padding);
-            }   
+        var site_header = $('#site-header');
+        var wpadmin_height = $('#wpadminbar').css('position') == 'fixed' && $('#wpadminbar').height() > 0 ? $('#wpadminbar').height() : 0;
+        var top_bars = $('#wpadminbar').css('position') == 'fixed' ? $('#top-bar-wrap').height() : $('#top-bar-wrap').height() + $('#wpadminbar').height();
+        if (Number.isNaN(top_bars)){
+            top_bars = $('#top-bar-wrap').height();
+        }
+        var header_status = $(window).scrollTop() >= top_bars;
+        var header_padding = site_header.height();
+        
+        if (style == 'float'){
+            
+            if (!header_status){
+                site_header.css({
+                    'position': 'relative',
+                    'top': '0',
+                });
+                site_header.next().css('margin-top', '0');
+            }else{
+                site_header.css({
+                    'position': 'fixed',
+                    'top': wpadmin_height,
+                    'width': '100%',
+                    'z-index': '998',
+                });
+                site_header.next().css('margin-top', header_padding);
+            }   
         }
         
@@ -51 +49 @@
                     'top': wpadmin_height,
                     'width': '100%',
-                    'z-index': '99999',
+                    'z-index': '998',
                 });
                 site_header.next().css('margin-top', header_padding);
@@ -64 +62 @@
         sticky_header_oceanwp();
     });
+        
+    $(window).scroll(function(){
+        sticky_header_oceanwp();
+    });
+    
+    sticky_header_oceanwp();
+
     
 });

sticky-header-oceanwp/trunk/sticky-header-oceanwp.php

@@ -3 +3 @@
  * Plugin Name:         Sticky Header OceanWP
  * Description:         Want a new fresh sticky header like everyone else, with our plugin you can get the best and better sticky header that you ever seen
- * Version:             1.0.5
+ * Version:             1.0.7
  * Author:              Oren Hahiashvili
  * Author URI:          https://www.script.co.il
  * Requires at least:   3.5.0
- * Tested up to:        4.9.8
- *
+ * Tested up to:        5.8
  * Text Domain: sticky-header-oceanwp
  * Domain Path: /languages/
- *
  */
 
@@ -19 +17 @@
 }
 
-add_action('wp_head', function(){
-    echo '<script>var sticky_header_style = "'. get_option('oceanwp_header_style') .'";</script>';
-});
-add_action('wp_enqueue_scripts', function(){
-        wp_enqueue_style( 'sticky-header-oceanwp-style', plugin_dir_url( __FILE__ ) . '/style.css', '1.0.0' );
-        wp_enqueue_script( 'sticky-header-oceanwp', plugin_dir_url( __FILE__ ) . '/main.js', array( 'jquery' ), '1.0.0' );
-});
-
-
 class sticky_header_oceanwp {
 
     function __construct() {
         add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-        add_action( 'init', array( $this, 'myplugin_load_textdomain' ) );
+        add_action( 'init', array( $this, 'init_stickyheader' ) );
     }
 
+    /* FRONT HANDLER START */
+    function init_stickyheader(){
+        
+        // LOAD PLUGIN LANGUAGE TRANSLATION FILES
+        $this->stickyheader_load_translations();
+        
+        // LOAD PLUGIN SCRIPTS AND STYLES
+        add_action( 'wp_enqueue_scripts', array( $this, 'stickyheader_load_assets' ) );
+        
+        // OUTPUT BY SCRIPT VALUES STICKY HEADER STYLING TYPE
+        add_action( 'wp_head', array( $this, 'stickyheader_output_style' ) );
+
+    }
     
-    function myplugin_load_textdomain() {
+    function stickyheader_output_style(){
+        
+        echo '<script>var sticky_header_style = "'. get_option('oceanwp_header_style') .'";</script>';
+        
+    }
+    
+    function stickyheader_load_assets(){
+        
+        wp_enqueue_style( 'sticky-header-oceanwp-style', plugin_dir_url( __FILE__ ) . '/style.css', '1.0.0' );
+        wp_enqueue_script( 'sticky-header-oceanwp', plugin_dir_url( __FILE__ ) . '/main.js', array( 'jquery' ), '1.0.0' );
+        
+    }
+    
+    function stickyheader_load_translations() {
         load_plugin_textdomain( 'sticky-header-oceanwp', false, basename( dirname( __FILE__ ) ) . '/languages' ); 
     }
+    /* FRONT HANDLER END */
     
     
+    /* ADMIN HANDLER START */
     function admin_menu() {
         add_options_page(
@@ -54 +71 @@
     }
 
-    function  settings_page() {
+    function settings_page() {
         
         $sticky_header_styles = array(
@@ -85 +102 @@
         <?php
     }
+    /* ADMIN HANDLER END */
+    
+    
 }