Merge branch 'master' of asdf.us:ascii

1 files changed, 2 insertions, 1 deletions

diff --git a/js/ui/controls.js b/js/ui/controls.js
index 485046e..ca6770f 100644
--- a/js/ui/controls.js
+++ b/js/ui/controls.js
@@ -121,6 +121,7 @@ var controls = (function(){
   controls.save.use = function(){
     clipboard.show()
     clipboard.export_mode()
+    clipboard.upload_png()
   }
   controls.load = new ClipboardTool (load_el)
   controls.load.use = function(){
@@ -147,7 +148,7 @@ var controls = (function(){
     }
   })
   controls.shader = new ShaderTool (shader_el)
-  shader_textarea.value = demo_shader.innerHTML
+  shader_textarea.value = shader_textarea.value || demo_shader.innerHTML
   shader_textarea.addEventListener("input", function(){
     var fn = shader.build(shader_textarea.value)
     fn && shader.run(canvas)