Desktop-Notifs: include the user id into the storage key for local browser storage
This commit is contained in:
		
					parent
					
						
							
								366ccdb09a
							
						
					
				
			
			
				commit
				
					
						8bd41592ef
					
				
			
		
					 1 changed files with 12 additions and 7 deletions
				
			
		
							
								
								
									
										13
									
								
								js/main.js
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								js/main.js
									
										
									
									
									
								
							|  | @ -223,8 +223,11 @@ | |||
| 				var nnm = $("#nav-notifications-menu"); | ||||
| 				nnm.html(notifications_all + notifications_mark); | ||||
| 
 | ||||
| 				var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); | ||||
| 				var lastItemStorageKey = "notification-lastitem:" + localUser; | ||||
| 				var notification_lastitem = parseInt(localStorage.getItem(lastItemStorageKey)); | ||||
| 				var notification_id = 0; | ||||
| 
 | ||||
| 				// Insert notifs into the notifications-menu
 | ||||
| 				$(data.notifications).each(function(key, notif){ | ||||
| 					var text = notif.message.format('<span class="contactname">' + notif.name + '</span>'); | ||||
| 					var contact = ('<a href="' + notif.url + '"><span class="contactname">' + notif.name + '</span></a>'); | ||||
|  | @ -242,9 +245,11 @@ | |||
| 					); | ||||
| 					nnm.append(html); | ||||
| 				}); | ||||
| 
 | ||||
| 				// Desktop Notifications
 | ||||
| 				$(data.notifications.reverse()).each(function(key, e){ | ||||
| 					notification_id = parseInt(e.timestamp); | ||||
| 					if (notification_lastitem !== null && notification_id > notification_lastitem) { | ||||
| 					if (notification_lastitem !== null && notification_id > notification_lastitem && !e.seen) { | ||||
| 						if (getNotificationPermission() === "granted") { | ||||
| 							var notification = new Notification(document.title, { | ||||
| 											  body: decodeHtml(e.message.replace('→ ', '').format(e.name)), | ||||
|  | @ -259,7 +264,7 @@ | |||
| 
 | ||||
| 				}); | ||||
| 				notification_lastitem = notification_id; | ||||
| 				localStorage.setItem("notification-lastitem", notification_lastitem) | ||||
| 				localStorage.setItem(lastItemStorageKey, notification_lastitem) | ||||
| 
 | ||||
| 				$("img[data-src]", nnm).each(function(i, el){ | ||||
| 					// Add src attribute for images with a data-src attribute
 | ||||
|  | @ -285,7 +290,7 @@ | |||
| 				$.jGrowl(message, {sticky: false, theme: 'info', life: 5000}); | ||||
| 			}); | ||||
| 
 | ||||
| 			/* update the js scrollbars */ | ||||
| 			// Update the js scrollbars
 | ||||
| 			$('#nav-notifications-menu').perfectScrollbar('update'); | ||||
| 
 | ||||
| 		}); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 rabuzarus
				rabuzarus