summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-26 21:45:12 -0500
committerjules <jules@okfoc.us>2014-01-26 21:45:12 -0500
commite3297c52583f38ed71f7734f1ff04a267834e40c (patch)
treeccbd2976dbe6d5a75be40d017d46341c4bd0b7ac /js
parent12b5c87fe564bb565eed4f8804142a60a6884c0b (diff)
fix rendering bug
Diffstat (limited to 'js')
-rw-r--r--js/api/gallery.js1
-rw-r--r--js/frames.js3
-rw-r--r--js/render.js2
3 files changed, 4 insertions, 2 deletions
diff --git a/js/api/gallery.js b/js/api/gallery.js
index 830ff93..e8af7f1 100644
--- a/js/api/gallery.js
+++ b/js/api/gallery.js
@@ -76,6 +76,7 @@ function load_shaders(err, shaders){
function display_shader(shader_object){
var $shader = $("<div>").addClass("shader")
$shader.data("shader", shader_object)
+ $shader.data("id", shader_object.id)
var html = shader_gallery_template
for (var field in shader_object) {
html = html.replace("{" + field + "}", shader_object[field])
diff --git a/js/frames.js b/js/frames.js
index 887b497..571e862 100644
--- a/js/frames.js
+++ b/js/frames.js
@@ -97,12 +97,11 @@ function sort_frames(){
function render (){
if (rendering) return
- rendering = true
-
if ($("#frames canvas.fullsize").length == 0) {
add_frame()
}
+ rendering = true
encoder.reset()
var delay = $("#framedelay").float() * 1000 || 100
$("#frames canvas.fullsize").each(function(){
diff --git a/js/render.js b/js/render.js
index 205da88..bd6deb1 100644
--- a/js/render.js
+++ b/js/render.js
@@ -7,6 +7,7 @@ function choose (){
loading = true
$("#url").val(this.src)
loadImage(this.src, ready)
+ reset()
}
function load(){
@@ -84,6 +85,7 @@ function reset(){
pause(false)
$("#workspace img").remove()
$("#workspace canvas").show()
+ $("#uploaded-url").hide().val("")
remove_all_frames()
draw(0)
}