phyks/cygnal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better spawn of the notification

Browse Source
This commit is contained in:
Lucas Verney 2018-09-21 15:11:12 +02:00
parent dca0f62394
commit 19cbb3165f
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/Map.vue
View File

@ -170,6 +170,7 @@ export default {
isReportDialogVisible: false,
noSleep: null,
notification: null,
notificationInitializationWatcher: null,
reportLatLng: null,
};
},
@ -180,8 +181,18 @@ export default {
'Cycl\'Assist',
{ body: $t('notification.body'), icon: AppLogo, tag: 'CyclassistMap' },
);
this.notification.addEventListener('click', this.showReportDialog);
this.notification.addEventListener('click', () => {
this.showReportDialog();
// Recreate permanent notification in case the OS closed it on click.
this.createNotification();
});
this.notification.addEventListener('close', this.createNotification);
// Remove the watcher if still there, no further need to watch properties.
if (this.notificationInitializationWatcher) {
this.notificationInitializationWatcher();
this.notificationInitializationWatcher = null;
}
},
disableNoSleep() {
if (this.noSleep) {
@ -249,12 +260,26 @@ export default {
return;
}
const that = this;
// Only create the notification once the position is ready
const createNotificationWhenPositionIsReady = (newValue) => {
if (newValue) {
that.createNotification();
}
};
if (Notification.permission && Notification.permission === 'granted') {
this.createNotification();
this.notificationInitializationWatcher = this.$watch(
'currentLatLng',
createNotificationWhenPositionIsReady,
);
} else {
Notification.requestPermission((permission) => {
if (permission === 'granted') {
this.createNotification();
this.notificationInitializationWatcher = this.$watch(
'currentLatLng',
createNotificationWhenPositionIsReady,
);
}
});
}
@ -269,6 +294,8 @@ export default {
},
},
mounted() {
this.setupNotification();
if (this.$route.name !== 'SharedMap') {
// Only enable NoSleep in normal map view (with position tracking).
this.setNoSleep();
@ -288,8 +315,6 @@ export default {
}
}
this.$store.dispatch('fetchReports').catch(() => {});
this.setupNotification();
},
};
</script>