diff options
Diffstat (limited to 'js/app.js')
| -rw-r--r-- | js/app.js | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -1,7 +1,9 @@ var dragging = false -var drawing = true +var drawing = false var erasing = false +var selecting = false +var filling = false var focused var canvas, tools, palette, controls, brush, mode, current_tool, current_canvas @@ -25,6 +27,8 @@ function build () { brush.bg = colors.red brush.generate() brush.build() + + controls.grid.use() } function bind () { canvas.bind() @@ -33,9 +37,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){ @@ -49,12 +58,4 @@ function bind () { }) } - -function int_key (f) { - return function (key, keyCode) { - var n = parseInt(key) - ! isNaN(n) && f(n) - } -} - init() |