summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/util/mouse.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/rectangles/util/mouse.js')
-rw-r--r--public/assets/javascripts/rectangles/util/mouse.js17
1 files changed, 11 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/util/mouse.js b/public/assets/javascripts/rectangles/util/mouse.js
index 2ec35e6..06958af 100644
--- a/public/assets/javascripts/rectangles/util/mouse.js
+++ b/public/assets/javascripts/rectangles/util/mouse.js
@@ -95,8 +95,6 @@ function mouse (opt) {
}
base.mousedown = function(e){
- e.stopPropagation()
-
if (opt.use_offset) {
offset = this.getBoundingClientRect()
}
@@ -106,12 +104,18 @@ function mouse (opt) {
var x = pos.a, y = pos.b
base.cursor = new Rect (x,y, x,y)
base.down = true
-
+ e.clickAccepted = true
+
base.tube("down", e, base.cursor)
+
+ if (e.clickAccepted) {
+ e.stopPropagation()
+ }
+ else {
+ base.down = false
+ }
}
base.mousemove = function(e){
- e.stopPropagation()
-
if (opt.use_offset && ! offset) return
var pos = positionFromMouse(e)
@@ -126,10 +130,11 @@ function mouse (opt) {
base.cursor.x.b = x
base.cursor.y.b = y
base.tube("drag", e, base.cursor)
+ e.stopPropagation()
}
else {
base.cursor.x.a = base.cursor.x.b = x
- base.cursor.y.a = base.cursor.y.b = y
+ base.cursor.y.a = base.cursor.y.b = y
base.tube("move", e, base.cursor)
}
}