fix: [HTML] Fix race conditions with Firefox

herotc · Oct 2, 2018 · 7f3bef5 · 7f3bef5
1 parent 4487c91
commit 7f3bef5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/gatsby-browser.js b/gatsby-browser.js
@@ -1,4 +1,4 @@
-export const onInitialClientRender = () => {
+export const onClientEntry = () => {
   // Make sure the main script exists
   if (!window.herodamage) window.herodamage = {}
   const hd = window.herodamage
@@ -8,7 +8,7 @@ export const onInitialClientRender = () => {
 
   if (process.env.NODE_ENV === 'production') {
     // Google Publisher Tag
-    const googletag = window.googletag || {}
+    const googletag = window.googletag = window.googletag || {}
     googletag.cmd = googletag.cmd || []
     googletag.cmd.push(function () {
       const topBotMapping = googletag.sizeMapping()
@@ -62,7 +62,7 @@ export const onInitialClientRender = () => {
       googletag.enableServices()
     })
 
-    // CookieConsent
+    // Cookie Consent
     window.addEventListener('load', function () {
       window.cookieconsent.initialise({
         palette: {
@@ -75,5 +75,5 @@ export const onInitialClientRender = () => {
   }
 
   // Prevent further initialization
-  hd.hasInitialized = true
+  hd.hasInitialized = Date.now()
 }
diff --git a/src/components/gpt-ad.js b/src/components/gpt-ad.js
@@ -82,10 +82,15 @@ class Ad extends React.Component {
    * Start the timer before checking for blockers
    */
   static scheduleBlockersCheck () {
-    if (window.herodamage.hasInitialized) {
-      setTimeout(Ad.blockersCheck, 500)
+    const hdInitTime = window.herodamage.hasInitialized
+    if (hdInitTime && Date.now() - hdInitTime > 500) {
+      if (Ad.adsReady()) {
+        setTimeout(Ad.blockersCheck, 500)
+      } else {
+        setTimeout(Ad.scheduleBlockersCheck, 50)
+      }
     } else {
-      setTimeout(Ad.scheduleBlockersCheck, 20)
+      setTimeout(Ad.scheduleBlockersCheck, 50)
     }
   }
 

diff --git a/src/html.js b/src/html.js
@@ -12,13 +12,11 @@ export default class HTML extends React.Component {
     let googlePublisherTag, cookieconsent
     if (process.env.NODE_ENV === 'production') {
       googlePublisherTag = <script async='async' src='https://www.googletagservices.com/tag/js/gpt.js'/>
-      cookieconsent = (
-        <>
-          <link type="text/css" rel="stylesheet"
-            href="https://cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.4/cookieconsent.min.css"/>
-          <script async src="https://cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"/>
-        </>
-      )
+      cookieconsent = (<>
+        <link type="text/css" rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.4/cookieconsent.min.css"/>
+        <script async src="https://cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"/>
+      </>)
     }
     const { body, bodyAttributes, headComponents, htmlAttributes, postBodyComponents, preBodyComponents } = this.props
     return (