Merge branch 'master' of https://github.com/debugger22/github-audio

hirajanwin · Oct 5, 2016 · 31ec3b0 · 31ec3b0
2 parents e4d1dce + d31b9c8
commit 31ec3b0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/public/js/main.js b/app/public/js/main.js
@@ -36,7 +36,7 @@ var socket = io(document.location.hostname);
 socket.on('github', function (data) {
   $('.online-users-count').html(data.connected_users);
   data.data.forEach(function(event){
-    if(!isEventInQueue(event) || shouldEventBeIgnored(event)){
+    if(!isEventInQueue(event)){
       eventQueue.push(event);
     }
   });
@@ -233,7 +233,7 @@ function playSound(size, type) {
 
 function playFromQueueExchange1(){
   var event = eventQueue.shift();
-  if(event != null && event.message != null && svg != null){
+  if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){
     playSound(event.message.length*1.1, event.type);
     if(!document.hidden)
       drawEvent(event, svg);
@@ -244,7 +244,7 @@ function playFromQueueExchange1(){
 
 function playFromQueueExchange2(){
   var event = eventQueue.shift();
-  if(event != null && event.message != null && svg != null){
+  if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){
     playSound(event.message.length, event.type);
     if(!document.hidden)
       drawEvent(event, svg);