odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Fixed bug in chrome: can not play the sound multiple times 

bzr revid: nicolas.vanhoren@openerp.com-20130111150426-4uk858n12lf2a3gm
This commit is contained in:
niv-openerp 2013-01-11 16:04:26 +01:00
parent 90164bfc1a
commit 88fe79c7c0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web_im/static/src/js/im.js
View File

@ -271,8 +271,14 @@ openerp.web_im = function(instance) {
this.window_focus_change();
this.on("change:waiting_messages", this, this.messages_change);
this.messages_change();
this.$ting = $(QWeb.render("Conversation.ting"));
this.$ting.appendTo($("body"));
this.create_ting();
},
create_ting: function() {
if (new Audio().canPlayType("audio/ogg; codecs=vorbis")) {
this.ting = new Audio(instance.webclient.session.origin + "/web_im/static/src/audio/Ting.ogg");
} else {
this.ting = new Audio(instance.webclient.session.origin + "/web_im/static/src/audio/Ting.mp3");
}
},
window_focus_change: function() {
if (this.get("window_focus")) {
@ -307,7 +313,8 @@ openerp.web_im = function(instance) {
received_message: function(message, user) {
if (! this.get("window_focus")) {
this.set("waiting_messages", this.get("waiting_messages") + 1);
this.$ting[0].play();
this.ting.play();
this.create_ting();
}
var conv = this.activate_user(user);
conv.received_message(message);
@ -320,7 +327,6 @@ openerp.web_im = function(instance) {
}, this);
},
destroy: function() {
this.$ting.remove();
$(window).unbind("blur", this.blur_hdl);
$(window).unbind("focus", this.focus_hdl);
this._super();

6
addons/web_im/static/src/xml/im.xml
View File

@ -59,10 +59,4 @@
<div class="oe_im_chatview_time"><t t-esc="time"/></div>
</div>
</t>
<t t-name="Conversation.ting">
<audio>
<source t-att-src="_s + '/web_im/static/src/audio/Ting.ogg'" />
<source t-att-src="_s + '/web_im/static/src/audio/Ting.mp3'" />
</audio>
</t>
</templates>