diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 6e5aa02a..04fcd573 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -3,10 +3,8 @@ require 'travis/location' Ember.Route.reopen enter: (router) -> @_super(router) - if @get('isLeafRoute') - path = @absoluteRoute(router) - if window.location.origin == 'https://travis-ci.org' - _gaq.push(['_trackPageview', path]); + if @get('isLeafRoute') && !window.location.host.match(/^staging\.|^localhost/) + _gaq.push(['_trackPageview', @absoluteRoute(router)]) defaultRoute = Ember.Route.extend route: '/' diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index d119cb67..9841eb64 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -33,6 +33,7 @@ Storage = Em.Object.extend config: api_endpoint: $('meta[rel="travis.api_endpoint"]').attr('href') pusher_key: $('meta[name="travis.pusher_key"]').attr('value') + ga_code: $('meta[name="travis.ga_code"]').attr('value') CONFIG_KEYS: ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala', 'compiler'] @@ -110,3 +111,4 @@ require 'ext/i18n' require 'travis/ajax' require 'app' +setupGoogleAnalytics() diff --git a/assets/scripts/vendor/ga.js b/assets/scripts/vendor/ga.js new file mode 100644 index 00000000..26ed6341 --- /dev/null +++ b/assets/scripts/vendor/ga.js @@ -0,0 +1,9 @@ +var setupGoogleAnalytics = function() { + var _gaq = _gaq || []; + _gaq.push(['_setAccount', Travis.config.ga_code]); + _gaq.push(['_trackPageview']); + + 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); +} diff --git a/config.ru b/config.ru index 1321c07d..4e95b1d7 100644 --- a/config.ru +++ b/config.ru @@ -29,5 +29,6 @@ run Travis::Web::App.new( environment: ENV['RACK_ENV'] || 'development', api_endpoint: ENV['API_ENDPOINT'], pusher_key: ENV['PUSHER_KEY'], + ga_code: ENV['GA_CODE'], root: File.expand_path('../public', __FILE__) ) diff --git a/public/index.html b/public/index.html index cc04ff41..fb4970ef 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,7 @@ + Travis CI - Free Hosted Continuous Integration Platform for the Open Source Community @@ -19,17 +20,5 @@ - -