Permalink
Browse files

Merge branch 'master' of gist.github.com:1619170

  • Loading branch information...
2 parents 598f8b5 + 3235aeb commit bcdd27ed5b37fc1c45efd2ea70489b791386f892 @utgarda committed Feb 13, 2012
Showing with 8 additions and 8 deletions.
  1. +4 −4 midi-keyboard-1.coffee
  2. +1 −1 midi-keyboard-2.coffee
  3. +1 −1 midi-keyboard-3.coffee
  4. +1 −1 midi-keyboard.html
  5. +1 −1 tree-frogs.html
@@ -1,4 +1,4 @@
-colors = [ '#CCDDBB', '#99CC66', '#88AA66', '#AADDCC'
+colors = [ '#CCDDBB', '#99CC66', '#88AA66', '#AADDCC'
'#66AAAA', '#559999', '#FFFFDD', '#FF9922'
'#DD8822', '#AACCDD', '#5599CC', '#4477AA' ]
nextSquareHtml = (color) -> """
@@ -7,6 +7,6 @@ height: 30px; width: 30px; margin: 5px; float: left"></div>"""
grow = (square) ->
square.animate(height: 60, 200).animate height: 30
for c in colors
- $(nextSquareHtml c)
- .appendTo( $ '#keyboard' )
- .click -> grow $(this)
+ $j(nextSquareHtml c)
+ .appendTo( $j '#keyboard' )
+ .click -> grow $j(this)
@@ -1,6 +1,6 @@
squares = ( $j(nextSquareHtml c) for c in colors )
for s,i in squares
- s.appendTo( $ '#keyboard' ) #assembling the keyboard
+ s.appendTo( $j '#keyboard' ) #assembling the keyboard
.click ->
grow $j(this), 7
#attach the next one, make it circular
@@ -2,4 +2,4 @@ grow = (square, i) ->
if i>0 and not square.is ':animated'
square.animate height: 60, 200,
-> grow square.data('next'), i-1
- .animate height: 30
+ .animate height: 30
View
@@ -10,7 +10,7 @@
<script type="text/coffeescript">
$j = jQuery
-colors = [ '#CCDDBB', '#99CC66', '#88AA66', '#AADDCC'
+colors = [ '#CCDDBB', '#99CC66', '#88AA66', '#AADDCC'
'#66AAAA', '#559999', '#FFFFDD', '#FF9922'
'#DD8822', '#AACCDD', '#5599CC', '#4477AA' ]
View
@@ -11,7 +11,7 @@
div.green-leaf div {border: 1px solid white; height: 38px; width: 38px; position: absolute}
</style>
-<div class='green-leaf' style='background: #458008; position: relative; width: 200px; height: 200px' >
+<div class='green-leaf' style='background: #458008; position: relative; width: 200px; height: 200px' >
<div id='ani3_bar0' style='background: #FF621D; left: 0; top:0'></div>
<div id='ani3_bar1' style='background: #B1D02C; left: 0; top:160px'></div>
<div id='ani3_bar2' style='background: #D5FA6F; left: 160px; top:160px'></div>

0 comments on commit bcdd27e

Please sign in to comment.