summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-26 03:13:42 -0500
committerjules <jules@okfoc.us>2014-01-26 03:13:42 -0500
commitd93bffc6438e6c89081b9b345c85a131a3de1138 (patch)
treec4b2d15fa50d49bf4caaa31cecf0611bbe52f1f3 /js
parent654ff510a723f545fe64ae629972f1fdc2a2705a (diff)
display rendered gif in workspace
Diffstat (limited to 'js')
-rw-r--r--js/frames.js5
-rw-r--r--js/render.js3
2 files changed, 5 insertions, 3 deletions
diff --git a/js/frames.js b/js/frames.js
index 62306fa..1d08807 100644
--- a/js/frames.js
+++ b/js/frames.js
@@ -109,7 +109,7 @@ function render (){
encoder.addFrame(frame.canvas, delay)
})
$("#pause,#render,#add-frame").disable()
- $("#rendered").find("img").remove()
+ $("#workspace").find("img").remove()
$("#rendered").show()
// really bad results with neuquant?
// status("quantizing")
@@ -144,7 +144,8 @@ encoder.on("rendered", function(bytes){
encoder.on("rendered-url", function(url){
var image = new Image ()
lastGif = image.src = url
- $("#rendered").append(image)
+ $("#workspace canvas").hide()
+ $("#workspace").append(image)
$("#uploaded-url").hide().val("")
$("#save,#upload,#rendered").show()
$("#pause,#render,#add-frame,#save,#upload").enable()
diff --git a/js/render.js b/js/render.js
index e379ab8..6ad7560 100644
--- a/js/render.js
+++ b/js/render.js
@@ -80,7 +80,8 @@ function reset(){
start_t = old_t
pause_t = 0
pause(false)
- $("#rendered img").remove()
+ $("#workspace img").remove()
+ $("#workspace canvas").show()
draw(0)
}