Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small bugfix

Browse source
This commit is contained in:
Zach Fox 2018-09-18 17:00:53 -07:00
parent 9db11aeda7
commit f70ecdad16
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/tablet-goto.js
View file

@ -35,14 +35,12 @@ function notificationPollCallback(userStoriesArray) {
// START logic for keeping track of new info // START logic for keeping track of new info
// //
pingPong = !pingPong; pingPong = !pingPong;
var totalCountedStories = 0; var totalNewStories = 0;
var shouldNotifyIndividually = !ui.isOpen && ui.notificationInitialCallbackMade; var shouldNotifyIndividually = !ui.isOpen && ui.notificationInitialCallbackMade;
userStoriesArray.forEach(function (story) { userStoriesArray.forEach(function (story) {
if (story.audience !== "for_connections" && if (story.audience !== "for_connections" &&
story.audience !== "for_feed") { story.audience !== "for_feed") {
return; return;
} else {
totalCountedStories++;
} }
var stored = storedAnnouncements[story.id] || storedFeaturedStories[story.id]; var stored = storedAnnouncements[story.id] || storedFeaturedStories[story.id];
@ -52,6 +50,8 @@ function notificationPollCallback(userStoriesArray) {
return; return;
} }
totalNewStories++;
if (story.audience === "for_connections") { if (story.audience === "for_connections") {
storedAnnouncements[story.id] = story; storedAnnouncements[story.id] = story;
@ -85,13 +85,13 @@ function notificationPollCallback(userStoriesArray) {
// END logic for keeping track of new info // END logic for keeping track of new info
// //
var notificationCount = Object.keys(storedAnnouncements).length + var totalStories = Object.keys(storedAnnouncements).length +
Object.keys(storedFeaturedStories).length; Object.keys(storedFeaturedStories).length;
shouldShowDot = totalCountedStories > 0 || (notificationCount > 0 && shouldShowDot); shouldShowDot = totalNewStories > 0 || (totalStories > 0 && shouldShowDot);
ui.messagesWaiting(shouldShowDot && !ui.isOpen); ui.messagesWaiting(shouldShowDot && !ui.isOpen);
if (notificationCount > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) { if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) {
message = "You have " + notificationCount + "event invitations pending! " + message = "You have " + totalStories + "event invitations pending! " +
"Open GOTO to see them."; "Open GOTO to see them.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }