Merge branch 'master' into production

This commit is contained in:
Matt Lott 2014-12-01 15:00:19 -08:00
commit 52a1f8ebc7

View file

@ -182,7 +182,7 @@ module.exports = class CocoRouter extends Backbone.Router
$("ul.nav li.#{base}").addClass('active')
_trackPageView: ->
window.tracker?.trackPageView()
window.tracker?.trackPageView null, ['Google Analytics']
onNavigate: (e) ->
if _.isString e.viewClass