upload style

3 files changed, 18 insertions, 3 deletions

diff --git a/js/app.js b/js/app.js
index a802869..9dd94ee 100644
--- a/js/app.js
+++ b/js/app.js
@@ -51,7 +51,7 @@ function bind () {
     
     var ae = document.activeElement
 
-    if (ae !== shader_textarea && ae !== import_textarea && ae !== username_input) {
+    if (ae !== shader_textarea && ae !== import_textarea && ae !== username_input && ae !== upload_input) {
       cursor_input.focus()
     }
 
diff --git a/js/clipboard.js b/js/clipboard.js
index 131f40b..b440ec9 100644
--- a/js/clipboard.js
+++ b/js/clipboard.js
@@ -220,12 +220,12 @@ var clipboard = (function () {
     },
     
     filename: function () {
-      return [ +new Date, "ascii", user.username ].join("-") + ".png"
+      return [ +new Date, "ascii", user.username ].join("-")
     },
     
     save_png: function () {
       clipboard.export_png()
-      var filename = clipboard.filename()
+      var filename = clipboard.filename() + ".png"
       var blob = dataUriToBlob(clipboard.canvas.toDataURL())
       saveAs(blob, filename);
     },
diff --git a/js/upload.js b/js/upload.js
index 354cee2..b1d2e2e 100644
--- a/js/upload.js
+++ b/js/upload.js
@@ -1,12 +1,21 @@
 var upload = (function(){
   var el = document.getElementById("upload_input")
+  var button = document.getElementById("upload_button")
+  var uploading = false
   
   function upload(uri, filename, tag){
+    if (uploading) return
     filename = filename || get_filename()
     uri = (uri && ! uri.target) ? uri : lastGif
     tag = tag || "shader"
 
     var blob = dataUriToBlob(uri)
+    
+    button.value = "uploading..."
+    button.className = "uploading"
+    
+    uploading = true
+    
     uploadImage({
       blob: blob,
       filename: filename,
@@ -22,10 +31,16 @@ var upload = (function(){
         el.style.display = "block"
         el.value = data.url
         el.focus()
+        button.value = "upload"
+        button.className = ""
+        uploading = false
       },
       error: function(data){
         console.log(data)
         console.log("error uploading: " + data.error)
+        button.value = "upload"
+        button.className = ""
+        uploading = false
       }
     });
   }