merge js into combo

3 files changed, 6 insertions, 4 deletions

diff --git a/js/frames.js b/js/frames.js
index c9c844d..2dddae2 100644
--- a/js/frames.js
+++ b/js/frames.js
@@ -29,6 +29,10 @@ frame_editor.bind = function(){
   $("#render").click(render)
   $("#save").click(save)
   $("#upload").click(upload)
+
+	$("#background").change(function(){
+		document.body.style.backgroundColor = $("#background").string()
+	})
 }
 
 function add_frame(){
@@ -121,8 +125,6 @@ function render (){
   $("#render").html("rendering")
 }
 
-function status(s){ $(".status").html(s) }
-
 var encoder = new GifEncoder()
 
 encoder.on("quantized", function(url){
diff --git a/js/help.js b/js/help.js
index 5610794..1794f3b 100644
--- a/js/help.js
+++ b/js/help.js
@@ -17,3 +17,5 @@ help.bind = function(){
 
 function drag_start(){ dragging = true; $(this).addClass("dragging") }
 function drag_stop(){ dragging = false; $(".dragging").removeClass("dragging") }
+
+function status(s){ $(".status").html(s); console.log(s) }
diff --git a/js/render.js b/js/render.js
index 4a9eeef..a22c9fe 100644
--- a/js/render.js
+++ b/js/render.js
@@ -102,5 +102,3 @@ function draw(t) {
   frame = giveFrame(t)
   shade(frame, t)
 }
-
-function status(s){ $(".status").html(s); console.log(s) }