summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-26 03:08:26 -0500
committerjules <jules@okfoc.us>2014-01-26 03:08:26 -0500
commit654ff510a723f545fe64ae629972f1fdc2a2705a (patch)
treedd7dd0fde33dabaef8027177cd1a2c148233e142 /js
parentfb322430f61b32af4e22d5136704ce87ddfd6f3a (diff)
frame editor html
Diffstat (limited to 'js')
-rw-r--r--js/frames.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/frames.js b/js/frames.js
index 2dddae2..62306fa 100644
--- a/js/frames.js
+++ b/js/frames.js
@@ -1,3 +1,4 @@
+var frame_thumb_size = 93
var frame_editor = {}
@@ -51,14 +52,14 @@ function add_single_frame(){
var frame = cc.clone().appendTo($el.find(".frame")[0])
frame.canvas.className = "fullsize"
frame.canvas.style.display = "none"
- var thumb = cc.clone().resize(100,100).appendTo($el.find(".frame")[0])
+ var thumb = cc.clone().resize(frame_thumb_size,frame_thumb_size).appendTo($el.find(".frame")[0])
$("#frames").append($el)
$("#render").enable()
}
function add_frames(frame_count){
rendering = true
var t = old_t - start_t - pause_t
- var frame_delay = $("#frameinterval").float() * 1000
+ var frame_delay = ($("#frameinterval").float() || $("#framedelay").float()) * 1000
var frame
for (var i = 0; i < frame_count; i++) {
frame = giveFrame(t)