From 4257b6f87bfe46a82a81b041eeb60a5d7fcc8635 Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Wed, 2 Mar 2011 02:02:28 +0100 Subject: [PATCH] fix sound issues in windows --- src/messenger/webim/install/whatsnew.txt | 1 + src/messenger/webim/js/164/common.js | 4 +--- src/messenger/webim/js/source/common.js | 27 ++++++------------------ 3 files changed, 8 insertions(+), 24 deletions(-) mode change 100644 => 100755 src/messenger/webim/js/source/common.js diff --git a/src/messenger/webim/install/whatsnew.txt b/src/messenger/webim/install/whatsnew.txt index 34bb822b..8187f4ba 100644 --- a/src/messenger/webim/install/whatsnew.txt +++ b/src/messenger/webim/install/whatsnew.txt @@ -11,6 +11,7 @@ [+] ability to override notification email for group [!] various compatibility fixes: button image, captcha, check webimroot variable (installation) [!] fix speed of history search, fix redirection to groups + [!] fix sound issues in windows 1.6.3 ----- diff --git a/src/messenger/webim/js/164/common.js b/src/messenger/webim/js/164/common.js index 786e50a1..a1cb644b 100644 --- a/src/messenger/webim/js/164/common.js +++ b/src/messenger/webim/js/164/common.js @@ -22,6 +22,4 @@ document.getElementsBySelector=function(a){if(!document.getElementsByTagName)ret if(g!=null)for(var o=0;o=0))a="audio/mpeg";return a} -function playSound(a){var b=document.getElementById("player");b&&b.parentNode.removeChild(b);var b=document.body.appendChild(document.createElement("div")),c=navigator.userAgent.toLowerCase();b.innerHTML=c.indexOf("safari")==-1&&c.indexOf("windows")!=-1?'':'
'} -function htmlescape(a){return a.replace("&","&").replace("<","<").replace(">",">").replace('"',""")}; +function playSound(a){var b=document.createElement("div");if(navigator.userAgent.toLowerCase().indexOf("opera")!=-1)b.style="position: absolute; left: 0px; top: -200px;";document.body.appendChild(b);b.innerHTML=''}function htmlescape(a){return a.replace("&","&").replace("<","<").replace(">",">").replace('"',""")}; diff --git a/src/messenger/webim/js/source/common.js b/src/messenger/webim/js/source/common.js old mode 100644 new mode 100755 index 48fd88df..c8e30312 --- a/src/messenger/webim/js/source/common.js +++ b/src/messenger/webim/js/source/common.js @@ -506,29 +506,14 @@ var CommonUtils = { } }; -function getWavMimeType() { - var mimeType = "application/x-mplayer2"; //default - var agt=navigator.userAgent.toLowerCase(); - if (navigator.mimeTypes && agt.indexOf("windows")==-1) { - //non-IE, no-Windows - var plugin=navigator.mimeTypes["audio/mpeg"].enabledPlugin; - if (plugin || agt.indexOf("opera")>=0) mimeType="audio/mpeg"; - }//end no-Windows - return mimeType; -} - function playSound(wav_file) { - var player = document.getElementById("player"); - if (player) { - player.parentNode.removeChild(player); - } - player = document.body.appendChild(document.createElement("div")); - var agt=navigator.userAgent.toLowerCase(); - if(agt.indexOf('safari') == -1 && agt.indexOf('windows') != -1) { - player.innerHTML = ''; - } else { - player.innerHTML = '
'; + var player = document.createElement("div"); + var agt = navigator.userAgent.toLowerCase(); + if(agt.indexOf('opera') != -1) { + player.style = "position: absolute; left: 0px; top: -200px;"; } + document.body.appendChild(player); + player.innerHTML = ''; } function htmlescape(str) {