Fix notification counts

Freegle · Dec 27, 2018 · d212efb · d212efb
1 parent aa073c9
commit d212efb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/http/js/iznik/base.js b/http/js/iznik/base.js
@@ -441,8 +441,9 @@ define([
 
     var chatTitleCount = 0;
     var newsfeedTitleCount = 0;
+    var workTitleCount = 0;
 
-    Iznik.setTitleCounts = function(chat, newsfeed) {
+    Iznik.setTitleCounts = function(chat, newsfeed, work) {
         if (chat !== null) {
             chatTitleCount = chat;
         }
@@ -451,7 +452,11 @@ define([
             newsfeedTitleCount = newsfeed;
         }
 
-        var unseen = chatTitleCount + newsfeedTitleCount;
+        if (work !== null) {
+            workTitleCount = work;
+        }
+
+        var unseen = chatTitleCount + newsfeedTitleCount + workTitleCount;
 
         // We'll adjust the count in the window title.
         var title = document.title;

diff --git a/http/js/iznik/models/session.js b/http/js/iznik/models/session.js
@@ -428,6 +428,7 @@ define([
                             })
 
                             document.title = (total == 0) ? 'ModTools' : ('(' + total + ') ModTools');
+                            Iznik.setTitleCounts(null, null, total);
 
                             if (total) {
                                 $('.js-workcount').html(total).show();

diff --git a/http/js/iznik/views/chat/chat.js b/http/js/iznik/views/chat/chat.js
@@ -218,7 +218,7 @@ define([
                     }
                 }
 
-                Iznik.setTitleCounts(titleunseen, null);
+                Iznik.setTitleCounts(titleunseen, null, null);
             });
 
             self.showMin();

diff --git a/http/js/iznik/views/pages/pages.js b/http/js/iznik/views/pages/pages.js
@@ -137,10 +137,10 @@ define([
                                     $('.js-notifholder .js-notifcount').css('visibility', 'hidden');
                                 }
 
-                                Iznik.setTitleCounts(null, ret.count);
+                                Iznik.setTitleCounts(null, ret.count, null);
                             }
 
-                            Iznik.setTitleCounts(null, ret.count);
+                            Iznik.setTitleCounts(null, ret.count, null);
                         }
                     }, complete: function() {
                         // We have the unseen newsfeed count in the session. That is loosely up to date, which is
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,7 +218,7 @@ define([ @@
                         }
                     }
-                    Iznik.setTitleCounts(titleunseen, null);
+                    Iznik.setTitleCounts(titleunseen, null, null);
                 });
                 self.showMin();
@@ Expand Down @@