summaryrefslogtreecommitdiff
path: root/assets/javascripts/rectangles/util
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-04-29 00:38:46 -0400
committerJulie Lala <jules@okfoc.us>2014-04-29 01:00:46 -0400
commit637ed631616a62940aeda1bc28d125c6ba84cbef (patch)
tree20aaff2c07c057c8860ec0e349b9d1234f33386f /assets/javascripts/rectangles/util
parente0dfff4729b342e8f573238135cb811bb5a0f43b (diff)
baby ducks
Diffstat (limited to 'assets/javascripts/rectangles/util')
-rw-r--r--assets/javascripts/rectangles/util/colors.js6
-rw-r--r--assets/javascripts/rectangles/util/mouse.js5
2 files changed, 8 insertions, 3 deletions
diff --git a/assets/javascripts/rectangles/util/colors.js b/assets/javascripts/rectangles/util/colors.js
index 17f0d8f..bb3662e 100644
--- a/assets/javascripts/rectangles/util/colors.js
+++ b/assets/javascripts/rectangles/util/colors.js
@@ -15,6 +15,12 @@
"rgba(0,0,0,0.3)",
"rgba(0,0,0,0.4)",
],
+ bone: [
+ "hsla(0,0%,90%,0.95)",
+ "hsla(0,0%,80%,0.95)",
+ "hsla(0,0%,85%,0.95)",
+ "hsla(0,0%,75%,0.95)",
+ ],
colors: [
"rgba(255,0,0,0.5)",
"rgba(255,128,0,0.5)",
diff --git a/assets/javascripts/rectangles/util/mouse.js b/assets/javascripts/rectangles/util/mouse.js
index 09fee0d..87a68fc 100644
--- a/assets/javascripts/rectangles/util/mouse.js
+++ b/assets/javascripts/rectangles/util/mouse.js
@@ -106,12 +106,11 @@ function mouse (opt) {
base.tube("move", e, base.cursor)
}
}
- base.mouseup = function(e){
- e.stopPropagation()
-
+ base.mouseup = function(e){
var pos, new_cursor
if (base.down) {
+ e.stopPropagation()
base.down = false
pos = positionFromMouse(e)
new_cursor = new Rect (pos.a, pos.b)