diff options
| -rw-r--r-- | routers/web/user/notification.go | 2 | ||||
| -rw-r--r-- | templates/user/notification/notification_div.tmpl | 2 | ||||
| -rw-r--r-- | web_src/js/features/notification.js | 16 |
3 files changed, 15 insertions, 5 deletions
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index 523e945db9..851af5d647 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -50,6 +50,7 @@ func Notifications(c *context.Context) { return } if c.QueryBool("div-only") { + c.Data["SequenceNumber"] = c.Query("sequence-number") c.HTML(http.StatusOK, tplNotificationDiv) return } @@ -175,6 +176,7 @@ func NotificationStatusPost(c *context.Context) { return } c.Data["Link"] = setting.AppURL + "notifications" + c.Data["SequenceNumber"] = c.Req.PostFormValue("sequence-number") c.HTML(http.StatusOK, tplNotificationDiv) } diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index e7327d34bb..8976e1fda4 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,4 +1,4 @@ -<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}"> +<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}" data-sequence-number="{{.SequenceNumber}}"> <div class="ui container"> <h1 class="ui dividing header">{{.i18n.Tr "notification.notifications"}}</h1> <div class="ui top attached tabular menu"> diff --git a/web_src/js/features/notification.js b/web_src/js/features/notification.js index 4fa2d3c29a..d964ffa305 100644 --- a/web_src/js/features/notification.js +++ b/web_src/js/features/notification.js @@ -1,5 +1,7 @@ const {AppSubUrl, csrf, NotificationSettings} = window.config; +let notificationSequenceNumber = 0; + export function initNotificationsTable() { $('#notification_table .button').on('click', async function () { const data = await updateNotification( @@ -10,8 +12,10 @@ export function initNotificationsTable() { $(this).data('notification-id'), ); - $('#notification_div').replaceWith(data); - initNotificationsTable(); + if ($(data).data('sequence-number') === notificationSequenceNumber) { + $('#notification_div').replaceWith(data); + initNotificationsTable(); + } await updateNotificationCount(); return false; @@ -139,10 +143,13 @@ async function updateNotificationTable() { url: `${AppSubUrl}/notifications?${notificationDiv.data('params')}`, data: { 'div-only': true, + 'sequence-number': ++notificationSequenceNumber, } }); - notificationDiv.replaceWith(data); - initNotificationsTable(); + if ($(data).data('sequence-number') === notificationSequenceNumber) { + notificationDiv.replaceWith(data); + initNotificationsTable(); + } } } @@ -182,6 +189,7 @@ async function updateNotification(url, status, page, q, notificationID) { page, q, noredirect: true, + 'sequence-number': ++notificationSequenceNumber, }, }); } |