fixed mouseup & down events for canvas + added a simple demo for mous…

…e usage
dkln · Jan 23, 2011 · da783dc · da783dc
1 parent 07cac67
commit da783dc
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/demos/demo.coffee b/demos/demo.coffee
@@ -37,6 +37,10 @@ run = ->
     mouseShape.x = stage.mouseX
     mouseShape.y = stage.mouseY
 
+  stage.onMouseUp = =>
+    if logo
+      Tween.to logo, 500, { x: stage.mouseX, y: stage.mouseY }
+
   stage.addChild someShape
   stage.addChild otherShape
   stage.addChild mouseShape

diff --git a/demos/demo.js b/demos/demo.js
diff --git a/lib/canvas_lib.js b/lib/canvas_lib.js
@@ -588,10 +588,16 @@ Stage = (function() {
     }
   };
   Stage.prototype.handleCanvasMouseDown = function(event) {
+    if (this.onMouseDown && !this.mouseDown) {
+      this.onMouseDown();
+    }
     return this.mouseDown = true;
   };
   Stage.prototype.handleCanvasMouseUp = function(event) {
-    return this.mouseUp = false;
+    if (this.onMouseUp && this.mouseDown) {
+      this.onMouseUp();
+    }
+    return this.mouseDown = false;
   };
   Stage.prototype.mouseHasMoved = function() {
     return this.oldMouseX !== this.mouseX || this.oldMouseY !== this.mouseY;

diff --git a/lib/stage.js b/lib/stage.js
@@ -153,10 +153,16 @@ Stage = (function() {
     }
   };
   Stage.prototype.handleCanvasMouseDown = function(event) {
+    if (this.onMouseDown && !this.mouseDown) {
+      this.onMouseDown();
+    }
     return this.mouseDown = true;
   };
   Stage.prototype.handleCanvasMouseUp = function(event) {
-    return this.mouseUp = false;
+    if (this.onMouseUp && this.mouseDown) {
+      this.onMouseUp();
+    }
+    return this.mouseDown = false;
   };
   Stage.prototype.mouseHasMoved = function() {
     return this.oldMouseX !== this.mouseX || this.oldMouseY !== this.mouseY;

diff --git a/src/stage.coffee b/src/stage.coffee
@@ -133,10 +133,12 @@ class Stage
     @onMouseMove() if @onMouseMove
 
   handleCanvasMouseDown: (event) ->
+    @onMouseDown() if @onMouseDown && !@mouseDown
     @mouseDown = true
 
   handleCanvasMouseUp: (event) ->
-    @mouseUp = false
+    @onMouseUp() if @onMouseUp && @mouseDown
+    @mouseDown = false
 
   mouseHasMoved: ->
     (@oldMouseX != @mouseX || @oldMouseY != @mouseY)