Skip to content

Only send desktop notifications in one tab #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Mar 29, 2021
Merged

Only send desktop notifications in one tab #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions js/notifications-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default {
return this.backgroundFetching
&& this.webNotificationsGranted
&& this.userStatus !== 'dnd'
&& this.tabId !== this.lastTabId
&& this.tabId === this.lastTabId
Copy link
Member Author

@nickvergessen nickvergessen Mar 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

due to this.lastTabId = response.lastTabId in the second part of the diff in this file, we always compared <tabid> !== undefined which was always true and therefor multiple tabs gave multiple desktop notifications again.

},
},

Expand Down Expand Up @@ -275,7 +275,7 @@ export default {
} else if (response.status === 200) {
this.userStatus = response.headers['x-nextcloud-user-status']
this.lastETag = response.headers.etag
this.lastTabId = response.lastTabId
this.lastTabId = response.tabId
this.notifications = response.data
this._setPollingInterval(this.pollIntervalBase)
this._updateDocTitleOnNewNotifications(this.notifications)
Expand Down
4 changes: 4 additions & 0 deletions src/Components/Notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ export default {
this._$el = $(this.$el)

// Parents: TransitionGroup > NotificationsList
if (typeof this.$parent.$parent.showBrowserNotifications === 'undefined') {
console.error('Failed to read showBrowserNotifications property from App component')
}

if (this.$parent.$parent.showBrowserNotifications) {
this._createWebNotification()
}
Expand Down