From 2de4442f9aeb6a4fc5d49fab8a15b41d87ff2fe4 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 11 Dec 2014 16:15:06 -0500 Subject: starting to write this stuff the fishbone thing is screwing me up --- js/app.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'js/app.js') diff --git a/js/app.js b/js/app.js index 6deab95..65c883b 100644 --- a/js/app.js +++ b/js/app.js @@ -1,7 +1,8 @@ var dragging = false -var drawing = true +var drawing = false var erasing = false +var selecting = false var focused var canvas, tools, palette, controls, brush, mode, current_tool, current_canvas @@ -35,9 +36,14 @@ function bind () { controls.bind() keys.bind() - window.addEventListener('mouseup', function(){ + window.addEventListener('mouseup', function(e){ dragging = erasing = false - if (current_tool.name != 'shader' && current_tool.name != 'load' && current_tool.name != 'save') { cursor_input.focus() } + if (current_tool.name != 'shader' && current_tool.name != 'load' && current_tool.name != 'save') { + cursor_input.focus() + } + if (selecting) { + selection.up(e) + } }); window.addEventListener('mousedown', function(e){ -- cgit v1.2.3-70-g09d2