Merge pull request #323 from mozilla/disableNotifications
disable upload/download notifications
This commit is contained in:
commit
dd62a137d2
2 changed files with 4 additions and 4 deletions
|
@ -180,10 +180,6 @@ $(document).ready(function() {
|
||||||
const fileSender = new FileSender(file);
|
const fileSender = new FileSender(file);
|
||||||
$('#cancel-upload').click(() => {
|
$('#cancel-upload').click(() => {
|
||||||
fileSender.cancel();
|
fileSender.cancel();
|
||||||
location.reload();
|
|
||||||
document.l10n.formatValue('uploadCancelNotification').then(str => {
|
|
||||||
notify(str);
|
|
||||||
});
|
|
||||||
storage.referrer = 'cancelled-upload';
|
storage.referrer = 'cancelled-upload';
|
||||||
|
|
||||||
// record upload-stopped (cancelled) by sender
|
// record upload-stopped (cancelled) by sender
|
||||||
|
@ -195,6 +191,7 @@ $(document).ready(function() {
|
||||||
cd1: event.type === 'drop' ? 'drop' : 'click',
|
cd1: event.type === 'drop' ? 'drop' : 'click',
|
||||||
cd2: 'cancelled'
|
cd2: 'cancelled'
|
||||||
});
|
});
|
||||||
|
location.reload();
|
||||||
});
|
});
|
||||||
|
|
||||||
fileSender.on('progress', progress => {
|
fileSender.on('progress', progress => {
|
||||||
|
|
|
@ -20,6 +20,8 @@ function hexToArray(str) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function notify(str) {
|
function notify(str) {
|
||||||
|
return str;
|
||||||
|
/* TODO: enable once we have an opt-in ui element
|
||||||
if (!('Notification' in window)) {
|
if (!('Notification' in window)) {
|
||||||
return;
|
return;
|
||||||
} else if (Notification.permission === 'granted') {
|
} else if (Notification.permission === 'granted') {
|
||||||
|
@ -29,6 +31,7 @@ function notify(str) {
|
||||||
if (permission === 'granted') new Notification(str);
|
if (permission === 'granted') new Notification(str);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
function gcmCompliant() {
|
function gcmCompliant() {
|
||||||
|
|
Loading…
Reference in a new issue