tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test changes and removed useless function stuff

This commit is contained in:
Thomas FORGIONE 2015-05-22 17:14:09 +02:00
parent 02650d6ea6
commit d385c9ee22
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/prototype/Coin.js vendored
View File

@ -51,18 +51,14 @@ Coin.prototype.get = function() {
var music = document.getElementById('music'); var music = document.getElementById('music');
var wasPlaying = !music.paused; var wasPlaying = !music.paused;
music.pause(); music.pause();
(function(music, wasPlaying) { setTimeout(function() {
Coin.lastSound.play();
setTimeout(function() { setTimeout(function() {
Coin.lastSound.play(); if (wasPlaying) {
(function(wasPlaying) { music.play();
setTimeout(function() { }
if (wasPlaying) { }, Coin.lastSound.duration*1000);
music.play(); }, Coin.nextSound.duration*1000);
}
}, Coin.lastSound.duration*1000);
})(wasPlaying);
}, Coin.nextSound.duration*1000);
})(music, wasPlaying);
} else { } else {
Coin.nextSound = new Audio('/static/data/music/redcoins/' + Coin.total + Coin.extension); Coin.nextSound = new Audio('/static/data/music/redcoins/' + Coin.total + Coin.extension);
Coin.nextSound.preload = "auto"; Coin.nextSound.preload = "auto";

2
server.js
View File

@ -85,5 +85,5 @@ if ( app.get('env') === 'development' ) {
} }
// Start server // Start server
console.log("Server ready : " + server_ip_address + ":" + server_port); console.log("Server ready : now listening " + server_ip_address + ":" + server_port);
app.listen(server_port, server_ip_address); app.listen(server_port, server_ip_address);