Merge pull request #339 from mozilla/v49

Show error page on firefox v49 and below
This commit is contained in:
Danny Coates 2017-07-28 11:42:21 -07:00 committed by GitHub
commit 6be94156db
7 changed files with 49 additions and 33 deletions

View file

@ -3,8 +3,28 @@ window.Raven.config(window.dsn).install();
window.dsn = undefined;
const testPilotGA = require('testpilot-ga');
const {gcmCompliant, sendEvent} = require('./utils');
window.analytics = new testPilotGA({
an: 'Firefox Send',
ds: 'web',
tid: window.trackerId
});
const isSender = !location.pathname.includes('/download');
gcmCompliant().catch(err => {
sendEvent(isSender ? 'sender' : 'recipient', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported/gcm');
});
});
if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 &&
parseInt(navigator.userAgent.toLowerCase().match(/firefox\/*([^\n\r]*)\./)[1]) <= 49) {
sendEvent(isSender ? 'sender' : 'recipient', 'unsupported', {
cd6: new Error('Firefox is outdated.')
}).then(() => {
location.replace('/unsupported/outdated');
});
}

View file

@ -1,6 +1,6 @@
require('./common');
const FileReceiver = require('./fileReceiver');
const { notify, findMetric, gcmCompliant, sendEvent } = require('./utils');
const { notify, findMetric, sendEvent } = require('./utils');
const bytes = require('bytes');
const Storage = require('./storage');
const storage = new Storage(localStorage);
@ -11,14 +11,6 @@ require('jquery-circle-progress');
const Raven = window.Raven;
$(document).ready(function() {
gcmCompliant().catch(err => {
$('#download').attr('hidden', true);
sendEvent('recipient', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported');
});
});
//link back to homepage
$('.send-new').attr('href', window.location.origin);

View file

@ -3,7 +3,6 @@ require('./common');
const FileSender = require('./fileSender');
const {
notify,
gcmCompliant,
findMetric,
sendEvent,
ONE_DAY_IN_MS
@ -25,15 +24,6 @@ if (storage.has('referrer')) {
}
$(document).ready(function() {
gcmCompliant().catch(err => {
$('#page-one').attr('hidden', true);
sendEvent('sender', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported');
});
});
$('#file-upload').change(onUpload);
$('.legal-links a, .social-links a, #dl-firefox').click(function(target) {