Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
wentin committed Feb 3, 2015
1 parent 5955c93 commit 93fe31b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions css/animation.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/animation.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/animation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ body.collapse {
.trigger {
-webkit-transition-delay: 0s;
transition-delay: 0s;
-webkit-transform: translateY(50%) scale(0.9);
transform: translateY(50%) scale(0.9);
-webkit-transform: translateY(150%) scale(0.9);
transform: translateY(150%) scale(0.9);
opacity: 0;
z-index: -1;
}
Expand Down
4 changes: 2 additions & 2 deletions css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/style.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/guitar-string.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@ GuitarString.prototype.mouseMove = function (self, event){
this.endPoint.x, this.endPoint.y);

if( mouseInGrabRange && lastMouseOutGrabRange && (!this.userInControl) ){
console.log('omg, grab!');
// console.log('grab!');
this.initState = false;
this.userInControl = true;
this.waveInControl = false;
this.waveFinished = false;

this.redrawActive = true;
} else if ( mouseOutControlRange && lastMouseInControlRange && this.userInControl){
console.log('boing!');
// console.log('boing!');
this.initState = false;
this.userInControl = false;
this.waveInControl = true;
Expand All @@ -207,7 +207,7 @@ GuitarString.prototype.mouseMove = function (self, event){
}

if( (!this.userInControl)&&mouseCrossed ) {
console.log('i just plucked!');
// console.log('i just plucked!');
this.initState = false;
this.userInControl = false;
this.waveInControl = true;
Expand Down

0 comments on commit 93fe31b

Please sign in to comment.