Changeset 1880716

Timestamp:

05/24/2018 11:19:47 AM (8 years ago)

Author:

basticom

Message:

Fixed caching problem for scripts and cookie bar

Location:

basticom-framework/trunk/admin/modules

Files:

• bstcmfw-cookie.php (modified) (4 diffs)
• includes/bstcmfw-cookie.css (modified) (3 diffs)
• includes/bstcmfw-cookie.js (modified) (1 diff)

basticom-framework/trunk/admin/modules/bstcmfw-cookie.php

@@ -10 +10 @@
 
 // Load and parse cookie HTML
-function bstcmfw_cookie_wrapper () { 
+function bstcmfw_cookie_wrapper () {
 
     // If bstcmfw cookie is enabled, add cookie HTML to WP footer, check if current page != readmore url
-    if ( !is_admin() && get_option('bstcmfw-cookie-enable') == 1 && !isset( $_COOKIE['bstcmfw_cookie_accept'] ) && !is_page( get_option( 'bstcmfw-cookie-read-more-link', false, 0 ) ) ) {
+    if ( !is_admin() && get_option('bstcmfw-cookie-enable') == 1 && !is_page( get_option( 'bstcmfw-cookie-read-more-link', false, 0 ) ) ) { //!isset( $_COOKIE['bstcmfw_cookie_accept'] ) &&
 
         // Get content of HTML file
@@ -104 +104 @@
 add_action('wp_ajax_nopriv_get_scripts_hook', 'bstmcfw_get_scripts');
 
-
+/* This shit aint gonna fly */
 function bstcmfw_output_default_scripts_header() {
     if(get_option('bstcmfw-cookie-enable') == 1) {
@@ -114 +114 @@
     }
 }
-add_action('wp_head', 'bstcmfw_output_default_scripts_header');
+//add_action('wp_head', 'bstcmfw_output_default_scripts_header');
 
-
+/* This shit aint gonna fly */
 function bstcmfw_output_default_scripts_footer() {
     if(get_option('bstcmfw-cookie-enable') == 1) {
@@ -126 +126 @@
     }
 }
-add_action('wp_footer', 'bstcmfw_output_default_scripts_footer');
+//add_action('wp_footer', 'bstcmfw_output_default_scripts_footer');
 
 

basticom-framework/trunk/admin/modules/includes/bstcmfw-cookie.css

@@ -11 +11 @@
     padding: 20px;
     border-radius: 2px;
+    display: none;
 }
 
@@ -19 +20 @@
         display: block;
         padding: 0;
+        display: block;
 }
 
@@ -55 +57 @@
     background: rgba(0, 0, 0, 0.6);
     z-index: 2147483646;
+    display: none;
 }
 

basticom-framework/trunk/admin/modules/includes/bstcmfw-cookie.js

@@ -6 +6 @@
 }
 
+// Set default scripts based on cookie settings (1: print accept scripts, 0: print decline scripts)
+jQuery( document ).ready(
+    function() {
+        'use strict';
+
+        jQuery.ajax(
+            {
+                type: "POST",
+                url: bstcmfw_ajax_cookie.ajaxurl,
+                dataType: "JSON",
+                data: {
+                action: 'get_scripts_hook',
+                cookie_accept: bstcmfw_get_cookie( 'bstcmfw_cookie_accept' )
+            },
+            success: function( data ) {
+                    jQuery( data.header ).appendTo( "head" );
+                    jQuery( data.footer ).appendTo( "body" );
+
+                    if ( 1 != bstcmfw_get_cookie( 'bstcmfw_cookie_accept' ) ) {
+                        jQuery('.bstcmfw-cookie-wrapper').show();
+                        jQuery('.bstcmfw-cookie-overlay').show();
+                    }
+
+                }
+            }
+        );
+
+    }
+);
 
 // Set cookie