Skip to content
Browse files

Merge branch 'master' of github.com:Flotype/jazzroom

  • Loading branch information...
2 parents 728f512 + d160179 commit 255cc9e2af2766a4c7ad74e63b3be23b6e10b5be Sridatta Thatipamala committed Mar 9, 2011
Showing with 16 additions and 1 deletion.
  1. +2 −0 public/css/style.css
  2. +14 −1 public/js/jazz.js
View
2 public/css/style.css
@@ -78,6 +78,7 @@ html, body {
#vail {
background-color: #000;
+ font-family: Arial, "Helvetica";
opacity: 0.8;
position: absolute;
width: 100%;
@@ -89,6 +90,7 @@ html, body {
font-size: 40px;
}
+
@-webkit-keyframes rotate {
0% {
-webkit-transform: rotate(-8deg);
View
15 public/js/jazz.js
@@ -1,5 +1,7 @@
var now = {};
+var isConnected = false;
+
var keymap = {
a: 'c',
w: 'cs',
@@ -29,7 +31,12 @@ function connected() {
}
});
- $("#vail").fadeOut(300).remove();
+ $("#vailmsg").fadeOut(300, function(){
+ $(this).text("You're playing the " + instrument);
+ $(this).fadeIn(300, function(){
+ $("#vail").delay(500).fadeOut(300).remove();
+ });
+ });
}
@@ -76,6 +83,12 @@ now.receiveNote = function (type, note) {
}
now.receiveTick = function() {
+
+ if(!isConnected) {
+ connected();
+ isConnected = true;
+ }
+
var mark = $("<div></div>").addClass("mark");
$("#disp").append(mark);

0 comments on commit 255cc9e

Please sign in to comment.
Something went wrong with that request. Please try again.