Merge branch 'develop'

MatteoGabriele · Aug 18, 2019 · 0ecc4c9 · 0ecc4c9
2 parents eb4afb3 + b8f215a
commit 0ecc4c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -11,7 +11,7 @@ export default () => {
     return
   }
 
-  const { disableScriptLoader: noScript, ready } = config
+  const { ready } = config
   const filename = config.debug.enabled ? 'analytics_debug' : 'analytics'
   const resource = config.customResourceURL || `https://www.google-analytics.com/${filename}.js`
 
@@ -26,7 +26,7 @@ export default () => {
     promisify(config.disabled)
   ]
 
-  if (shouldGaLoad() && (!window.ga || !noScript)) {
+  if (shouldGaLoad()) {
     queue.push(
       loadScript(resource).catch(() => {
         throw new Error (

diff --git a/src/helpers.js b/src/helpers.js
@@ -54,7 +54,18 @@ export function hasScript () {
 }
 
 export function shouldGaLoad () {
-  return !(config.checkDuplicatedScript && hasScript())
+  const {
+    checkDuplicatedScript,
+    disableScriptLoader
+  } = config
+
+  const requires = [
+    Boolean(window && window.ga),
+    (checkDuplicatedScript && !hasScript()),
+    !disableScriptLoader
+  ]
+
+  return requires.some(Boolean)
 }
 
 export function getTracker (tracker) {