From d94793ac72f6ab5390291f781b8c75dc19d1db7f Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henke.hedelund@gmail.com>
Date: Tue, 24 Jan 2017 21:13:32 +0100
Subject: [PATCH] Set site ID and tracker URL before including piwik.js

---
 view/frontend/templates/piwik.phtml |  7 ++++--
 view/frontend/web/js/tracker.js     | 37 ++++++++++++++---------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/view/frontend/templates/piwik.phtml b/view/frontend/templates/piwik.phtml
index 278ed86..6177b12 100644
--- a/view/frontend/templates/piwik.phtml
+++ b/view/frontend/templates/piwik.phtml
@@ -34,7 +34,10 @@
 // event which breaks the link tracking feature.
 ?>
 <script type="text/javascript">
-(function (d) {
+(function (w, d) {
+    w._paq = w._paq || [];
+    w._paq.push(['setTrackerUrl', '<?php echo $block->escapeJsQuote($block->getTrackerUrl()); ?>']);
+    w._paq.push(['setSiteId', <?php echo (int) $block->getSiteId(); ?>]);
     var g = d.createElement('script'),
         s = d.getElementsByTagName('script')[0];
     g.type = 'text/javascript';
@@ -42,7 +45,7 @@
     g.defer = true;
     g.src = '<?php echo $block->escapeJsQuote($block->getScriptUrl()); ?>';
     s.parentNode.insertBefore(g, s);
-})(document);
+})(window, document);
 </script>
 <noscript>
     <p>
diff --git a/view/frontend/web/js/tracker.js b/view/frontend/web/js/tracker.js
index 91ee4e2..fd13593 100644
--- a/view/frontend/web/js/tracker.js
+++ b/view/frontend/web/js/tracker.js
@@ -78,19 +78,14 @@ define([
      * Append Piwik tracker script URL to head
      *
      * @param {String} scriptUrl
-     * @return bool Wheter the script was injected
      */
     function injectScript(scriptUrl) {
-        if (piwik === null) {
-            $('<script>')
-                .attr('type', 'text/javascript')
-                .attr('async', true)
-                .attr('defer', true)
-                .attr('src', scriptUrl)
-                .appendTo('head');
-            return true;
-        }
-        return false; // Script is already included
+        $('<script>')
+            .attr('type', 'text/javascript')
+            .attr('async', true)
+            .attr('defer', true)
+            .attr('src', scriptUrl)
+            .appendTo('head');
     }
 
     /**
@@ -236,16 +231,20 @@ define([
      * @param {Object} options
      */
     function initialize(options) {
-        pushAction([
-            ['setSiteId', defaultSiteId = options.siteId],
-            ['setTrackerUrl', defaultTrackerUrl = options.trackerUrl]
-        ]);
-        pushAction(options.actions);
-        if (!injectScript(options.scriptUrl)) {
-            // If the tracker script was not injected we already have the Piwik
-            // object and can resolve promises immediately.
+        defaultSiteId = options.siteId;
+        defaultTrackerUrl = options.trackerUrl;
+        if (piwik === null) {
+            pushAction([
+                ['setSiteId', defaultSiteId],
+                ['setTrackerUrl', defaultTrackerUrl]
+            ]);
+            injectScript(options.scriptUrl);
+        } else {
+            // If we already have the Piwik object we can resolve any pending
+            // promises immediately.
             resolvePiwikPromises();
         }
+        pushAction(options.actions);
     }
 
     // Make sure the Piwik asynchronous tracker queue is defined