Merge pull request #29 from henkelund/2.0.1

2.0.1
fnogatz · Mar 27, 2018 · 1685ec0 · 1685ec0
2 parents ec5e702 + 2f2821e
commit 1685ec0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - 7.1
   - 7.0
 env:
+  - M2_VERSION=2.2.3
   - M2_VERSION=2.2.2
   - M2_VERSION=2.2.1
   - M2_VERSION=2.2.0

diff --git a/view/frontend/web/js/tracker.js b/view/frontend/web/js/tracker.js
@@ -288,19 +288,31 @@ define([
     }
 
     /**
-     * Initialzie this component with given options
+     * Checks that piwik.js is already on page
+     *
+     * @param {String} scriptUrl
+     * @returns {boolean}
+     */
+    function scriptExists(scriptUrl) {
+        return $('script[src="' + scriptUrl + '"]').length === 1;
+    }
+
+    /**
+     * Initialize this component with given options
      *
      * @param {Object} options
      */
     function initialize(options) {
         defaultSiteId = options.siteId;
         defaultTrackerUrl = options.trackerUrl;
         if (piwik === null) {
-            pushAction([
-                ['setSiteId', defaultSiteId],
-                ['setTrackerUrl', defaultTrackerUrl]
-            ]);
-            injectScript(options.scriptUrl);
+            if (!scriptExists(options.scriptUrl)) {
+                pushAction([
+                    ['setSiteId', defaultSiteId],
+                    ['setTrackerUrl', defaultTrackerUrl]
+                ]);
+                injectScript(options.scriptUrl);
+            }
         } else {
             // If we already have the Piwik object we can resolve any pending
             // promises immediately.