twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-09-09 12:42:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #201 from slr/issp-fix-ntf-snd

Browse Source 
fix default value of sound notification, fix player for mentions
This commit is contained in:
miguelfreitas 2014-11-07 18:49:06 -02:00
commit 60ff4cad8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/options.js
View File

@ -44,7 +44,7 @@ var TwisterOptions = function()
this.volumeControl = function() { this.volumeControl = function() {
var playerVol = $('#playerVol'); var playerVol = $('#playerVol');
playerVol[0].value = $.Options.getOption(playerVol[0].id, 100); playerVol[0].value = $.Options.getOption(playerVol[0].id, 1);
$('.volValue').text((playerVol[0].value * 100).toFixed()); $('.volValue').text((playerVol[0].value * 100).toFixed());
playerVol.on('change',function(){ playerVol.on('change',function(){
@ -67,14 +67,14 @@ var TwisterOptions = function()
player.attr('type', 'audio/ogg'); player.attr('type', 'audio/ogg');
player.attr('src', 'sound/'+sndDM+'.ogg'); player.attr('src', 'sound/'+sndDM+'.ogg');
} }
player[0].volume = $.Options.getOption('playerVol',100); player[0].volume = $.Options.getOption('playerVol',1);
player[0].play(); player[0].play();
} }
this.mensNotif = function() { this.mensNotif = function() {
var sndMention = $.Options.getOption('sndMention', "false"); var sndMention = $.Options.getOption('sndMention', "false");
if(sndMention == "false") return; if(sndMention == "false") return;
var player = $('#player'); var player = $('#playerSec');
$('#playerSec').empty(); $('#playerSec').empty();
if (player[0].canPlayType('audio/mpeg;')) { if (player[0].canPlayType('audio/mpeg;')) {
@ -84,7 +84,7 @@ var TwisterOptions = function()
player.attr('type', 'audio/ogg'); player.attr('type', 'audio/ogg');
player.attr('src', 'sound/'+sndMention+'.ogg'); player.attr('src', 'sound/'+sndMention+'.ogg');
} }
player[0].volume = $.Options.getOption('playerVol',100); player[0].volume = $.Options.getOption('playerVol',1);
player[0].play(); player[0].play();
} }