From 5abc877a38a7187e8fa8786c86f272f18149ef1a Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sun, 9 Mar 2014 01:16:39 +0000 Subject: [PATCH] VRFS-709 added calls to GA record/session tracking --- web/app/assets/javascripts/ga.js | 10 ++++++++++ web/app/assets/javascripts/jam_rest.js | 5 +++++ web/app/assets/javascripts/web/recordings.js | 8 ++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/ga.js b/web/app/assets/javascripts/ga.js index 297f27f76..11a96eed6 100644 --- a/web/app/assets/javascripts/ga.js +++ b/web/app/assets/javascripts/ga.js @@ -228,8 +228,15 @@ context.ga('send', 'event', categories.recording, recordingActions.share, shareType); } + function _defaultPlayAction() { + return !window.jamClient || ((typeof(FakeJamClient)!='undefined') && window.jamClient === FakeJamClient) ? 'Website' : 'Client'; + } + // when someone plays a recording function trackRecordingPlay(recordingAction) { + if (!recordingAction) { + recordingAction = _defaultPlayAction(); + } assertOneOf(recordingAction, recordingPlayActions); var label = JK.currentUserId ? userLabels.registeredUser : userLabels.visitor; @@ -238,6 +245,9 @@ // when someone plays a live session broadcast function trackSessionPlay(recordingAction) { + if (!recordingAction) { + recordingAction = _defaultPlayAction(); + } assertOneOf(recordingAction, sessionPlayActions); var label = JK.currentUserId ? userLabels.registeredUser : userLabels.visitor; diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js index 2c752b97a..8ab79d201 100644 --- a/web/app/assets/javascripts/jam_rest.js +++ b/web/app/assets/javascripts/jam_rest.js @@ -107,6 +107,11 @@ } function addPlayablePlay(playableId, playableType, claimedRecordingId, userId) { + if (playableType == 'JamRuby::Recording') { + context.JK.GA.trackRecordingPlay(); + } else if (playableType == 'JamRuby::MusicSessionHistory') { + context.JK.GA.trackSessionPlay(); + } return $.ajax({ url: '/api/users/' + playableId + "/plays", type: "POST", diff --git a/web/app/assets/javascripts/web/recordings.js b/web/app/assets/javascripts/web/recordings.js index a8a2d2461..1b38c3ab9 100644 --- a/web/app/assets/javascripts/web/recordings.js +++ b/web/app/assets/javascripts/web/recordings.js @@ -58,10 +58,10 @@ } function play() { - rest.addPlayablePlay(recordingId, claimedRecordingId, JK.currentUserId) - .done(function(response) { - $("#spnPlayCount", $scope).html(parseInt($("#spnPlayCount").text()) + 1); - }); + // rest.addPlayablePlay(recordingId, claimedRecordingId, JK.currentUserId) + // .done(function(response) { + // $("#spnPlayCount", $scope).html(parseInt($("#spnPlayCount").text()) + 1); + // }); } function addComment() {