Resolve conflict

[rails.git] / app / assets / javascripts / piwik.js

diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js
index d81a9ec630a97e2da3cf94c8152cb788a6ee1e17..a48e903add43ee638029805e80323307b20fc596 100644 (file)
--- a/app/assets/javascripts/piwik.js
+++ b/app/assets/javascripts/piwik.js
@@ -1,13 +1,14 @@
 if (OSM.PIWIK) {
   $(document).ready(function () {
     var base = document.location.protocol + "//" + OSM.PIWIK.location + "/";
+    var piwikTracker;
 
-    $.ajax({
+    var piwikLoader = $.ajax({
       url: base + "piwik.js",
       dataType: "script",
       cache: true,
       success: function () {
-        var piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
+        piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
       
         piwikTracker.trackPageView();
         piwikTracker.enableLinkTracking();
@@ -17,5 +18,11 @@ if (OSM.PIWIK) {
         });
       }
     });
+
+    $("body").on("piwikgoal", function (e, goal) {
+      piwikLoader.done(function () {
+        piwikTracker.trackGoal(goal);
+      });
+    });
   });
 }