Skip to content
Snippets Groups Projects
Commit 82176062 authored by jonasblumer's avatar jonasblumer
Browse files

fixed display issue chrome

parent 6980891b
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@ io.on('connection', function(socket){
io.sockets.emit('updateUserCount', Object.keys(io.engine.clients).length);
socket.on('disconnect', function(){
io.sockets.emit('updateUserCount', Object.keys(io.engine.clients).length);
//io.sockets.emit('clearExternalData');
io.sockets.emit('clearExternalData');
});
console.log('a user connected');
socket.on('bpm', function(newBpm){
......@@ -41,11 +41,6 @@ io.on('connection', function(socket){
});
io.sockets.emit('setBpmSlider', bpm);
/*
socket.on('playSound', function(data){
socket.broadcast.emit('playExternalSound', data);
});
*/
socket.on('grid', function(data){
socket.broadcast.emit('updateExternalGrid', data);
});
......
......@@ -18,7 +18,6 @@ $(function(){
// metronome
iosocket.on('metronome', function(serverStepPos){
console.log('tick');
stepPos = serverStepPos;
advanceStep(stepPos);
playExternalSound();
......@@ -32,15 +31,14 @@ $(function(){
});
iosocket.on('updateExternalGrid', function(data){
//playExternalSound(data));
externalGrid = data;
});
/*
iosocket.on('clearExternalData', function(){
externalGrid = null;
});
*/
iosocket.on('updateUserCount', function(userCount){
userCount--;
......@@ -128,14 +126,12 @@ function generateSteps(){
function playSound(){
for (var i = 0; i < 4; i++){
if($('.step'+stepPos)[i].checked){
//$('body').css('background-color', randomColor());
var sound = $('#row'+i+' select').val();
this[sound].pause();
this[sound].currentTime = 0;
this[sound].playbackRate = $('#pitchRow'+i).val();
this[sound].volume = $('#volumeRow'+i).val();
this[sound].play();
//iosocket.emit('playSound', {pitch: $('#pitchRow'+i).val(), sound: sound});
}
}
}
......
......@@ -5,10 +5,10 @@ body{
font-family: 'Codystar', cursive;
color:#9d0000;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none;
}
#container{
......@@ -28,12 +28,11 @@ user-select: none;
.beatIndicator{
border: 1px solid black;
width: 8px;
height: 8px;
margin-right:8px;
margin-left:8px;
border-radius: 5px;
float: left;
}
.beatIndicator.inactive{
......@@ -85,6 +84,7 @@ label.css-label {
td{
vertical-align: middle!important;
border-radius:7px;
width:20px;
}
.styled-select select {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment