From 56e17d9babc7ff891f1c10a82592a4053480fcdd Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 4 Aug 2015 00:18:28 -0400 Subject: dont clobber shader --- js/ui/controls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ui/controls.js b/js/ui/controls.js index 485046e..9fd6dc5 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -147,7 +147,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) -- cgit v1.2.3-70-g09d2 From 225c8ddca60ad01bf85d06213c9e520d0f8f909e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 4 Aug 2015 00:20:39 -0400 Subject: auto-upload ascii --- js/ui/controls.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/ui/controls.js b/js/ui/controls.js index 9fd6dc5..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(){ -- cgit v1.2.3-70-g09d2