Merge branch 'master' of lmno:ascii

1 files changed, 4 insertions, 1 deletions

diff --git a/js/app.js b/js/app.js
index 64f8bea..6afbbcc 100644
--- a/js/app.js
+++ b/js/app.js
@@ -58,7 +58,7 @@ function bind () {
     var ae = document.activeElement
 
     if (ae !== shader_textarea && ae !== import_textarea && ae !== username_input && ae !== upload_input) {
-      cursor_input.focus()
+      if (is_desktop) cursor_input.focus()
     }
 
     if (selecting) {
@@ -69,6 +69,9 @@ function bind () {
     }
   })
   window.addEventListener("touchend", function(){
+    if (current_tool.name === "text") {
+      if (is_desktop) cursor_input.focus()
+    }
     dragging = false
   })