diff --git a/frontend/src/download.js b/frontend/src/download.js index b9692401e..0f0043574 100644 --- a/frontend/src/download.js +++ b/frontend/src/download.js @@ -14,23 +14,17 @@ $(document).ready(function() { //link back to homepage $('.send-new').attr('href', window.location.origin); - $('.send-new').click(function(target) { - target.preventDefault(); + $('.send-new').click(function() { sendEvent('recipient', 'restarted', { cd2: 'completed' - }).then(() => { - location.href = target.currentTarget.href; }); }); $('.legal-links a, .social-links a, #dl-firefox').click(function(target) { - target.preventDefault(); const metric = findMetric(target.currentTarget.href); // record exited event by recipient sendEvent('recipient', 'exited', { cd3: metric - }).then(() => { - location.href = target.currentTarget.href; }); }); diff --git a/frontend/src/upload.js b/frontend/src/upload.js index 2191a7fe4..1ae584282 100644 --- a/frontend/src/upload.js +++ b/frontend/src/upload.js @@ -23,35 +23,26 @@ $(document).ready(function() { $('#file-upload').change(onUpload); $('.legal-links a, .social-links a, #dl-firefox').click(function(target) { - target.preventDefault(); const metric = findMetric(target.currentTarget.href); // record exited event by recipient sendEvent('sender', 'exited', { cd3: metric - }).then(() => { - location.href = target.currentTarget.href; }); }); - $('#send-new-completed').click(function(target) { - target.preventDefault(); + $('#send-new-completed').click(function() { // record restarted event + storage.referrer = 'errored-upload'; sendEvent('sender', 'restarted', { cd2: 'completed' - }).then(() => { - storage.referrer = 'completed-upload'; - location.href = target.currentTarget.href; }); }); - $('#send-new-error').click(function(target) { - target.preventDefault(); + $('#send-new-error').click(function() { // record restarted event + storage.referrer = 'errored-upload'; sendEvent('sender', 'restarted', { cd2: 'errored' - }).then(() => { - storage.referrer = 'errored-upload'; - location.href = target.currentTarget.href; }); }); diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index a0c7d55f5..15a1fdce0 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -43,12 +43,12 @@