diff options
| author | Julie Lala <jules@okfoc.us> | 2014-04-17 02:45:54 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-04-17 02:45:54 -0400 |
| commit | 892295b1c254c461614145dc67d63e09bf76661d (patch) | |
| tree | 56784a2986472044cd414eb5abdfe58eb88471c2 /assets/javascripts/rectangles/map | |
| parent | 1af8f41cc88e3c57bfabe6d4a5dcd83fc4a0e1bc (diff) | |
dragging
Diffstat (limited to 'assets/javascripts/rectangles/map')
| -rw-r--r-- | assets/javascripts/rectangles/map/draw.js | 2 | ||||
| -rw-r--r-- | assets/javascripts/rectangles/map/ui.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/assets/javascripts/rectangles/map/draw.js b/assets/javascripts/rectangles/map/draw.js index eb3dece..40bb483 100644 --- a/assets/javascripts/rectangles/map/draw.js +++ b/assets/javascripts/rectangles/map/draw.js @@ -39,7 +39,7 @@ function draw_mouse(mouse){ ctx.fill(); if (mouse.width() != 0 && mouse.height() != 0) { - if (clipper.dragging) { + if (map.ui.dragging) { stroke_rect(mouse) } else { diff --git a/assets/javascripts/rectangles/map/ui.js b/assets/javascripts/rectangles/map/ui.js index 05fad90..8c2b668 100644 --- a/assets/javascripts/rectangles/map/ui.js +++ b/assets/javascripts/rectangles/map/ui.js @@ -32,7 +32,9 @@ var map = new function(){ map.ui = new function(){ var base = this base.el = document.querySelector("#map") - + + base.creating = base.dragging = false + base.mouse = new mouse({ el: base.el, down: down, @@ -53,7 +55,7 @@ map.ui = new function(){ cursor.y.add( map.center.b - map.bounds.b/2 ) var intersects = clipper.rooms.filter(function(r){ - return r.focused = r.rect.contains(cursor) + return r.focused = r.rect.contains(cursor.x.a, cursor.y.a) }) if (intersects.length){ |