Merge branch 'master' into production

This commit is contained in:
Matt Lott 2016-07-20 14:45:51 -07:00
commit f797154796
2 changed files with 9 additions and 9 deletions

View file

@ -96,7 +96,7 @@ module.exports = class Tracker extends CocoClass
trackPageView: (includeIntegrations=[]) ->
includeMixpanel = (name) ->
mixpanelIncludes = ['', 'schools', 'play', 'play/level/dungeons-of-kithgard']
mixpanelIncludes = []
name in mixpanelIncludes or /courses|students|teachers/ig.test(name)
name = Backbone.history.getFragment()

View file

@ -62,42 +62,42 @@ module.exports = class NewHomeView extends RootView
super()
onClickLearnMoreLink: ->
window.tracker?.trackEvent 'Homepage Click Learn More', category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent 'Homepage Click Learn More', category: 'Homepage', []
@scrollToLink('#classroom-in-box-container')
onClickPlayButton: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
onClickRequestDemo: (e) ->
@playSound 'menu-button-click'
e.preventDefault()
e.stopImmediatePropagation()
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
if me.isTeacher()
application.router.navigate '/teachers/update-account', trigger: true
else
application.router.navigate '/teachers/demo', trigger: true
onClickSetupClass: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
application.router.navigate("/teachers/classes", { trigger: true })
onClickStudentButton: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
onClickTeacherButton: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
if me.isTeacher()
application.router.navigate('/teachers', { trigger: true })
else
@scrollToLink('.request-demo-row', 600)
onClickViewProfile: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
application.router.navigate("/user/#{me.getSlugOrID()}", { trigger: true })
onClickWikiButton: (e) ->
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', ['Mixpanel']
window.tracker?.trackEvent $(e.target).data('event-action'), category: 'Homepage', []
window.location.href = 'https://sites.google.com/a/codecombat.com/teacher-guides/course-guides'
afterRender: ->