Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-06-21 09:48:05 -07:00
commit 337aae10db

View file

@ -89,7 +89,7 @@ module.exports = class PlayLevelView extends View
setTimeout f, 100 setTimeout f, 100
else else
@load() @load()
application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID, ['Google Analytics']
setUpHourOfCode: -> setUpHourOfCode: ->
me.set 'hourOfCode', true me.set 'hourOfCode', true
@ -291,7 +291,7 @@ module.exports = class PlayLevelView extends View
@loadEndTime = new Date() @loadEndTime = new Date()
loadDuration = @loadEndTime - @loadStartTime loadDuration = @loadEndTime - @loadStartTime
console.debug "Level unveiled after #{(loadDuration / 1000).toFixed(2)}s" console.debug "Level unveiled after #{(loadDuration / 1000).toFixed(2)}s"
application.tracker?.trackEvent 'Finished Level Load', level: @levelID, label: @levelID, loadDuration: loadDuration application.tracker?.trackEvent 'Finished Level Load', level: @levelID, label: @levelID, loadDuration: loadDuration, ['Google Analytics']
application.tracker?.trackTiming loadDuration, 'Level Load Time', @levelID, @levelID application.tracker?.trackTiming loadDuration, 'Level Load Time', @levelID, @levelID
onSurfaceSetUpNewWorld: -> onSurfaceSetUpNewWorld: ->