natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved back to common

This commit is contained in:
Abhinav Adduri 2017-07-27 10:01:39 -07:00 committed by Erica Wright
parent 8eae1f282b
commit 7a53ed96ed
No known key found for this signature in database
GPG Key ID: D9F2AF9D67D0AAB7
3 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/common.js
View File

@ -8,4 +8,25 @@ window.analytics = new testPilotGA({
an: 'Firefox Send', an: 'Firefox Send',
ds: 'web', ds: 'web',
tid: window.trackerId tid: window.trackerId
}); });
const isSender = location.pathname.includes('/download');
gcmCompliant().catch(err => {
$('#page-one').attr('hidden', true);
$('#download').attr('hidden', true);
sendEvent(isSender ? 'sender' : 'recipient', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported');
});
});
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');
});
}

19
frontend/src/download.js
View File

@ -8,25 +8,6 @@ const storage = new Storage(localStorage);
const $ = require('jquery'); const $ = require('jquery');
require('jquery-circle-progress'); require('jquery-circle-progress');
gcmCompliant().catch(err => {
$('#page-one').attr('hidden', true);
$('#download').attr('hidden', true);
sendEvent('recipient', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported');
});
});
if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 &&
parseInt(navigator.userAgent.toLowerCase().match(/firefox\/*([^\n\r]*)\./)[1]) <= 49) {
sendEvent('recipient', 'unsupported', {
cd6: new Error('Firefox is outdated.')
}).then(() => {
location.replace('/unsupported');
});
}
const Raven = window.Raven; const Raven = window.Raven;
$(document).ready(function() { $(document).ready(function() {

20
frontend/src/upload.js
View File

@ -11,26 +11,6 @@ const bytes = require('bytes');
const Storage = require('./storage'); const Storage = require('./storage');
const storage = new Storage(localStorage); const storage = new Storage(localStorage);
gcmCompliant().catch(err => {
$('#page-one').attr('hidden', true);
$('#download').attr('hidden', true);
sendEvent('sender', 'unsupported', {
cd6: err
}).then(() => {
location.replace('/unsupported');
});
});
if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 &&
parseInt(navigator.userAgent.toLowerCase().match(/firefox\/*([^\n\r]*)\./)[1]) <= 49) {
sendEvent('sender', 'unsupported', {
cd6: new Error('Firefox is outdated.')
}).then(() => {
location.replace('/unsupported');
});
}
const $ = require('jquery'); const $ = require('jquery');
require('jquery-circle-progress'); require('jquery-circle-progress');