Merge pull request #372 from admix/bug979111

[bug979111] - Moved google analytics into separate file
mozilla · Mar 11, 2014 · c041124 · c041124
2 parents 839c8ec + fc79207
commit c041124
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/public/scripts/google-analytics.js b/public/scripts/google-analytics.js
@@ -0,0 +1,20 @@
+var _gaq = _gaq || [];
+
+(function() {
+  var ga_account = document.getElementById("google-analytics-js").getAttribute("data-ga-account");
+  var ga_domain = document.getElementById("google-analytics-js").getAttribute("data-ga-domain"); 
+
+  _gaq.push(['_setAccount', ga_account]);
+
+  if(ga_domain) {
+    _gaq.push(['_setDomainName', ga_domain]);
+  }
+
+  _gaq.push(['_trackPageview']);
+
+  var ga = document.createElement('script'); ga.type = 'text/javascript';
+  ga.async = true;
+  ga.src = 'https://ssl.google-analytics.com/ga.js';
+  var s = document.getElementsByTagName('script')[0];
+  s.parentNode.insertBefore(ga, s);
+})();
diff --git a/views/googleanalytics.html b/views/googleanalytics.html
diff --git a/views/layout.html b/views/layout.html
@@ -18,7 +18,13 @@
     <script src="https://cdn.optimizely.com/js/206878104.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.js"></script>
-    {% include "googleanalytics.html" %}
+    {% if GA_ACCOUNT %}
+    <script id="google-analytics-js" src="/scripts/google-analytics.js"
+            data-ga-account="{{ GA_ACCOUNT }}"
+            data-ga-domain="{{ GA_DOMAIN }}"
+            async>
+    </script>        
+    {% endif %}
   </head>
   <body style="margin: 0" data-make-url="{{ makeUrl }}" data-make-endpoint="{{ MAKE_ENDPOINT }}">
     {% block body %}{% endblock %}