tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-24 Miguel de Dios <miguel.dedios@artica.es> 

* operation/events/sound_events.php, godmode/setup/setup.php: fixed
	the audio, now it uses the html5 tag.
	
	Fixes: #3472957
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-04-24 14:46:00 +00:00
parent a380cb1f90
commit 7eefc80401
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/sound_events.php, godmode/setup/setup.php: fixed
the audio, now it uses the html5 tag.
Fixes: #3472957
MERGED FROM 4.0.2
2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
* install.php: cleaned source code style.

4
pandora_console/godmode/setup/setup.php
View File

@ -260,14 +260,14 @@ function toggleButton(type) {
}
else {
$("#button_sound_" + type).attr('src', 'images/control_pause.png');
$('#layer_sound_' + type).html("<embed src='" + $("#sound_" + type).val() + "' autostart='true' hidden='true' loop='true'>");
$('#layer_sound_' + type).html("<audio src='" + $("#sound_" + type).val() + "' autoplay='true' hidden='true' loop='true'>");
}
}
function replaySound(type) {
if ($("#button_sound_" + type).attr('src') == 'images/control_pause.png') {
$('#layer_sound_' + type).html("");
$('#layer_sound_' + type).html("<embed src='" + $("#sound_" + type).val() + "' autostart='true' hidden='true' loop='true'>");
$('#layer_sound_' + type).html("<audio src='" + $("#sound_" + type).val() + "' autoplay='true' hidden='true' loop='true'>");
}
}

6
pandora_console/operation/events/sound_events.php
View File

@ -122,11 +122,11 @@ function toggleButton() {
function ok() {
fired = false;
$('body').css('background', 'white');
$('embed').remove();
$('audio').remove();
}
function stopSound() {
$('embed').remove();
$('audio').remove();
$('body').css('background', 'white');
redBackground = false;
@ -179,7 +179,7 @@ function check_event() {
id_row = firedId;
fired = true;
$('embed').remove();
$('body').append("<embed src='../../" + data['sound'] + "' autostart='true' hidden='true' loop='true'>");
$('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
}
},
"json"