Merge pull request #912 from nextcloud/backport/909/stable20

[stable20] Only send desktop notifications in one tab

Author: nickvergessen

js/notifications-main.js

@@ -109,7 +109,7 @@ export default {
 			return this.backgroundFetching
 				&& this.webNotificationsGranted
 				&& this.userStatus !== 'dnd'
-				&& this.tabId !== this.lastTabId
+				&& this.tabId === this.lastTabId
 		},
 	},
 
@@ -230,7 +230,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(30000)
 			} else if (response.status === 304) {

js/notifications-main.js.map

@@ -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()
 		}