summaryrefslogtreecommitdiff
path: root/assets/javascripts/rectangles/util
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-04-28 18:49:49 -0400
committerJules Laplace <jules@okfoc.us>2014-04-28 18:49:49 -0400
commitfe91a9fe2ce70a679fc836fd1a1f8bde3d3b63e2 (patch)
tree01c8d4ee2895c308f753f37b0e884b0af8659f33 /assets/javascripts/rectangles/util
parent5341b0b2c197cbfdc1304e756e43b7d0ad399220 (diff)
pictures on walls
Diffstat (limited to 'assets/javascripts/rectangles/util')
-rw-r--r--assets/javascripts/rectangles/util/colors.js2
-rw-r--r--assets/javascripts/rectangles/util/mouse.js7
2 files changed, 7 insertions, 2 deletions
diff --git a/assets/javascripts/rectangles/util/colors.js b/assets/javascripts/rectangles/util/colors.js
index 031690c..17f0d8f 100644
--- a/assets/javascripts/rectangles/util/colors.js
+++ b/assets/javascripts/rectangles/util/colors.js
@@ -43,7 +43,7 @@
wall.randomize_colors()
})
})
-
+ select.blur()
})
window.colors = color_palettes[select.value]
diff --git a/assets/javascripts/rectangles/util/mouse.js b/assets/javascripts/rectangles/util/mouse.js
index 8d94201..09fee0d 100644
--- a/assets/javascripts/rectangles/util/mouse.js
+++ b/assets/javascripts/rectangles/util/mouse.js
@@ -49,6 +49,8 @@ function mouse (opt) {
opt.up && base.tube.on("up", opt.up)
opt.rightclick && base.tube.on("rightclick", opt.rightclick)
+ var offset = opt.el.getBoundingClientRect()
+
base.init = function (){
base.bind()
}
@@ -61,7 +63,6 @@ function mouse (opt) {
}
function positionFromMouse(e) {
- var offset = opt.el.getBoundingClientRect()
var mx = offset.left - e.pageX
var my = e.pageY - offset.top
@@ -71,6 +72,8 @@ function mouse (opt) {
base.mousedown = function(e){
e.stopPropagation()
+ offset = opt.el.getBoundingClientRect()
+
var pos = positionFromMouse(e)
var x = pos.a, y = pos.b
@@ -82,6 +85,8 @@ function mouse (opt) {
base.mousemove = function(e){
e.stopPropagation()
+ if (! offset) return;
+
var pos = positionFromMouse(e)
if (e.shiftKey) {