Merge pull request #954 from darkwing/analytics-dev

Don't load analytics on dev
mdn · Mar 25, 2013 · 660f95d · 660f95d
2 parents 6cc467e + 7632b9f
commit 660f95d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/landing/test_templates.py b/apps/landing/test_templates.py
@@ -27,7 +27,7 @@ def test_social_promo(self):
     def test_google_analytics(self):
         url = reverse('landing.views.home')
 
-        constance.config.GOOGLE_ANALYTICS_ACCOUNT = ''
+        constance.config.GOOGLE_ANALYTICS_ACCOUNT = '0'
         r = self.client.get(url, follow=True)
         eq_(200, r.status_code)
         ok_('var _gaq' not in r.content)

diff --git a/templates/includes/google_analytics.html b/templates/includes/google_analytics.html
@@ -1,15 +1,15 @@
-{% if config.GOOGLE_ANALYTICS_ACCOUNT %}
+{% if config.GOOGLE_ANALYTICS_ACCOUNT != '0' %}
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', '{{ config.GOOGLE_ANALYTICS_ACCOUNT }}']);
   _gaq.push(['_trackPageview']);
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
+  (function(a, d) {
+    var ga = d.createElement(a); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == d.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = d.getElementsByTagName(a)[0]; s.parentNode.insertBefore(ga, s);
+  })('script', document);
 
 </script>
 {% endif %}