logan/DRB-CnC
1
0
Fork 0
Code Issues 23 Pull Requests Packages Projects 1 Releases Wiki Activity

Only concat the stored toasts with new toast when there are stored toasts

Browse Source
This commit is contained in:
Logan Cusano
2023-07-22 14:46:51 -04:00
parent a5996ccfc0
commit ec091c0017
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Client/public/res/js/node.js
View File

@@ -30,13 +30,15 @@ function addToastToStorage(time, message) {
var toasts = [{ 'time': time, 'message': message }] var toasts = [{ 'time': time, 'message': message }]
var storedToasts = getStoredToasts(); var storedToasts = getStoredToasts();
console.log("Adding new notification to storage: ", toasts); console.log("Adding new notification to storage: ", toasts);
toasts = toasts.concat(storedToasts); if (storedToasts) {
console.log("Combined new and stored notifications: ", toasts); toasts = toasts.concat(storedToasts);
toasts = toasts.filter((value, index, self) => console.log("Combined new and stored notifications: ", toasts);
index === self.findIndex((t) => ( toasts = toasts.filter((value, index, self) =>
t.time === value.time && t.message === value.message index === self.findIndex((t) => (
)) t.time === value.time && t.message === value.message
) ))
)
}
console.log("Deduped stored notifications: ", toasts); console.log("Deduped stored notifications: ", toasts);
localStorage.setItem("toasts", JSON.stringify(toasts)); localStorage.setItem("toasts", JSON.stringify(toasts));
navbarUpdateNotificationBellCount(toasts); navbarUpdateNotificationBellCount(toasts);

16
Server/public/res/js/node.js
View File

@@ -30,13 +30,15 @@ function addToastToStorage(time, message) {
var toasts = [{ 'time': time, 'message': message }] var toasts = [{ 'time': time, 'message': message }]
var storedToasts = getStoredToasts(); var storedToasts = getStoredToasts();
console.log("Adding new notification to storage: ", toasts); console.log("Adding new notification to storage: ", toasts);
toasts = toasts.concat(storedToasts); if (storedToasts) {
console.log("Combined new and stored notifications: ", toasts); toasts = toasts.concat(storedToasts);
toasts = toasts.filter((value, index, self) => console.log("Combined new and stored notifications: ", toasts);
index === self.findIndex((t) => ( toasts = toasts.filter((value, index, self) =>
t.time === value.time && t.message === value.message index === self.findIndex((t) => (
)) t.time === value.time && t.message === value.message
) ))
)
}
console.log("Deduped stored notifications: ", toasts); console.log("Deduped stored notifications: ", toasts);
localStorage.setItem("toasts", JSON.stringify(toasts)); localStorage.setItem("toasts", JSON.stringify(toasts));
navbarUpdateNotificationBellCount(toasts); navbarUpdateNotificationBellCount(toasts);