diff --git a/code/modules/vchat/css/css-testing.html b/code/modules/vchat/css/css-testing.html index 750e9430d4..94e2844b91 100644 --- a/code/modules/vchat/css/css-testing.html +++ b/code/modules/vchat/css/css-testing.html @@ -1,85 +1,109 @@ - + -
- Test Person says, "Testing say message."
- Testing notice message.
- Testing danger message.
- [Security] Secu Person says, "Testing radio message."
- Testing OOC message.
- Testing LOOC message.
- Testing asay message.
- Test Person says, "Testing say message 2."
- Testing notice message 2.
- Testing danger message 2.
- [Security] Secu Person says, "Testing radio message 2".
- Testing OOC message 2.
- Testing LOOC message 2.
- Testing asay message 2.
- Test Person says, "Testing say message 3."
- Testing notice message 3.
- Testing danger message 3.
- [Security] Secu Person says, "Testing radio message 3".
- Testing OOC message 3.
- Testing LOOC message 3.
- Testing asay message 3.
- Test Person says, "Testing say message 4."
- Testing notice message 4.
- Testing danger message 4.
- [Security] Secu Person says, "Testing radio message 4".
- Testing OOC message 4.
- Testing LOOC message 4.
- Testing asay message 4.
- Test Person says, "Testing say message 5."
- Testing notice message 5.
- Testing danger message 5.
- [Security] Secu Person says, "Testing radio message 5".
- Testing OOC message 5.
- Testing LOOC message 5.
- Testing asay message 5.
+
+
+ Main +
+
+ OOC +
15
+
+ +
+
+
+ +
+
+ +
+
{{latency}}ms
+
+
-
- Test Person says, "Testing say message."
- Testing notice message.
- Testing danger message.
- [Security] Secu Person says, "Testing radio message."
- Testing OOC message.
- Testing LOOC message.
- Testing asay message.
- Test Person says, "Testing say message 2."
- Testing notice message 2.
- Testing danger message 2.
- [Security] Secu Person says, "Testing radio message 2".
- Testing OOC message 2.
- Testing LOOC message 2.
- Testing asay message 2.
- Test Person says, "Testing say message 3."
- Testing notice message 3.
- Testing danger message 3.
- [Security] Secu Person says, "Testing radio message 3".
- Testing OOC message 3.
- Testing LOOC message 3.
- Testing asay message 3.
- Test Person says, "Testing say message 4."
- Testing notice message 4.
- Testing danger message 4.
- [Security] Secu Person says, "Testing radio message 4".
- Testing OOC message 4.
- Testing LOOC message 4.
- Testing asay message 4.
- Test Person says, "Testing say message 5."
- Testing notice message 5.
- Testing danger message 5.
- [Security] Secu Person says, "Testing radio message 5".
- Testing OOC message 5.
- Testing LOOC message 5.
- Testing asay message 5.
+ +
+
+ Test Person says, "Testing say message."
+ Testing notice message.
+ Testing danger message.
+ [Security] Secu Person says, "Testing radio message."
+ Testing OOC message.
+ Testing LOOC message.
+ Testing asay message.
+ Test Person says, "Testing say message 2."
+ Testing notice message 2.
+ Testing danger message 2.
+ [Security] Secu Person says, "Testing radio message 2".
+ Testing OOC message 2.
+ Testing LOOC message 2.
+ Testing asay message 2.
+ Test Person says, "Testing say message 3."
+ Testing notice message 3.
+ Testing danger message 3.
+ [Security] Secu Person says, "Testing radio message 3".
+ Testing OOC message 3.
+ Testing LOOC message 3.
+ Testing asay message 3.
+ Test Person says, "Testing say message 4."
+ Testing notice message 4.
+ Testing danger message 4.
+ [Security] Secu Person says, "Testing radio message 4".
+ Testing OOC message 4.
+ Testing LOOC message 4.
+ Testing asay message 4.
+ Test Person says, "Testing say message 5."
+ Testing notice message 5.
+ Testing danger message 5.
+ [Security] Secu Person says, "Testing radio message 5".
+ Testing OOC message 5.
+ Testing LOOC message 5.
+ Testing asay message 5.
+
+
+ Test Person says, "Testing say message."
+ Testing notice message.
+ Testing danger message.
+ [Security] Secu Person says, "Testing radio message."
+ Testing OOC message.
+ Testing LOOC message.
+ Testing asay message.
+ Test Person says, "Testing say message 2."
+ Testing notice message 2.
+ Testing danger message 2.
+ [Security] Secu Person says, "Testing radio message 2".
+ Testing OOC message 2.
+ Testing LOOC message 2.
+ Testing asay message 2.
+ Test Person says, "Testing say message 3."
+ Testing notice message 3.
+ Testing danger message 3.
+ [Security] Secu Person says, "Testing radio message 3".
+ Testing OOC message 3.
+ Testing LOOC message 3.
+ Testing asay message 3.
+ Test Person says, "Testing say message 4."
+ Testing notice message 4.
+ Testing danger message 4.
+ [Security] Secu Person says, "Testing radio message 4".
+ Testing OOC message 4.
+ Testing LOOC message 4.
+ Testing asay message 4.
+ Test Person says, "Testing say message 5."
+ Testing notice message 5.
+ Testing danger message 5.
+ [Security] Secu Person says, "Testing radio message 5".
+ Testing OOC message 5.
+ Testing LOOC message 5.
+ Testing asay message 5.
+
diff --git a/code/modules/vchat/html/vchat.html b/code/modules/vchat/html/vchat.html index fef4621b8b..24ad6581f3 100644 --- a/code/modules/vchat/html/vchat.html +++ b/code/modules/vchat/html/vchat.html @@ -27,7 +27,7 @@
{{tab.name}} -
+
{{tab_unread_count(tab)}}
diff --git a/code/modules/vchat/js/vchat.js b/code/modules/vchat/js/vchat.js index 4e6e88e9b9..497cfb7ff1 100644 --- a/code/modules/vchat/js/vchat.js +++ b/code/modules/vchat/js/vchat.js @@ -312,7 +312,7 @@ function start_vue() { tab.active = true; tab.classes.forEach( function(cls) { - this.unread_messages[cls] = false; + this.unread_messages[cls] = 0; }, this); }, //Toggle edit mode @@ -354,6 +354,16 @@ function start_vue() { this.switchtab(this.tabs[0]); this.tabs.splice(this.tabs.indexOf(doomed_tab), 1); }, + tab_unread_count: function(tab) { + var unreads = 0; + var thisum = this.unread_messages; + tab.classes.find( function(cls){ + if(thisum[cls]) { + unreads += thisum[cls]; + } + }); + return unreads; + }, tab_unread_classes: function(tab) { var unreads = false; var thisum = this.unread_messages; @@ -378,7 +388,10 @@ function start_vue() { //Get a category newmessage.category = this.get_category(newmessage.content); if(!this.active_tab.classes.some(function(cls) { return (cls == newmessage.category || cls == "vc_showall"); })) { - this.unread_messages[newmessage.category] = true; + if (isNaN(this.unread_messages[newmessage.category])) { + this.unread_messages[newmessage.category] = 0; + } + this.unread_messages[newmessage.category] += 1; } //Try to crush it with one of the last few