summaryrefslogtreecommitdiff
path: root/js/ui/controls.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2016-03-22 11:36:42 -0400
committerJules Laplace <jules@okfoc.us>2016-03-22 11:36:42 -0400
commit6a30feead73dbee2d664b0099efcdc5106096c55 (patch)
tree25685907394a49d2e22637f7e5c649904e09c4dc /js/ui/controls.js
parent858587af95cfd02341cee1ec1f63c560f6944145 (diff)
parentb55c277f18a56cb6c6f85df968111f230e828b07 (diff)
Merge branch 'master' of lmno:ascii
Diffstat (limited to 'js/ui/controls.js')
-rw-r--r--js/ui/controls.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/ui/controls.js b/js/ui/controls.js
index a21e293..c191cc2 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -72,6 +72,7 @@ var controls = (function(){
undo.new()
undo.save_rect(0, 0, canvas.w, canvas.h)
canvas.erase()
+ current_filetool && current_filetool.blur()
}
controls.webcam = new FileTool (webcam_el)
@@ -119,9 +120,9 @@ var controls = (function(){
})
controls.save = new ClipboardTool (save_el)
controls.save.use = function(){
+ changed && clipboard.upload_png()
clipboard.show()
clipboard.export_mode()
- clipboard.upload_png()
}
controls.load = new ClipboardTool (load_el)
controls.load.use = function(){