From ac762e00562e0a7ad39954fd6b775a03fe77a001 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 3 Apr 2016 20:58:17 -0400 Subject: [PATCH] prevent double sound --- app/assets/javascripts/src/views/chatView.js.erb | 4 ++-- app/assets/javascripts/src/views/room.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/src/views/chatView.js.erb b/app/assets/javascripts/src/views/chatView.js.erb index e1aa4af5..174d54bb 100644 --- a/app/assets/javascripts/src/views/chatView.js.erb +++ b/app/assets/javascripts/src/views/chatView.js.erb @@ -109,7 +109,7 @@ Metamaps.Views.chatView = (function () { this.$unread.html(this.unreadMessages); this.$unread.show(); }, - addMessage: function(message, isInitial, wasMe) { + addMessage: function(message, isInitial) { if (!this.isOpen && !isInitial) Private.incrementUnread.call(this); @@ -133,7 +133,7 @@ Metamaps.Views.chatView = (function () { this.$messages.append($html); if (!isInitial) this.scrollMessages(200); - if (!isInitial && this.alertSound && !wasMe) this.sound.play('receivechat'); + if (!isInitial && this.alertSound) this.sound.play('receivechat'); }, initialMessages: function() { var messages = this.messages.models; diff --git a/app/assets/javascripts/src/views/room.js b/app/assets/javascripts/src/views/room.js index a12c04e0..a6f0eec8 100644 --- a/app/assets/javascripts/src/views/room.js +++ b/app/assets/javascripts/src/views/room.js @@ -164,7 +164,7 @@ Metamaps.Views.room = (function () { }); m.save(null, { success: function (model, response) { - self.addMessages(new Metamaps.Backbone.MessageCollection(model)); + self.addMessages(new Metamaps.Backbone.MessageCollection(model), true); $(document).trigger(room.events.newMessage, [model]); }, error: function (model, response) {