From 3a51572e8a6628f90e73e2ab0bca52a98d9540e7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 23 Jan 2014 10:10:19 -0500
Subject: more shuffling

---
 shader-picker.html | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'shader-picker.html')

diff --git a/shader-picker.html b/shader-picker.html
index 923f1b6..0f27d6a 100644
--- a/shader-picker.html
+++ b/shader-picker.html
@@ -147,32 +147,13 @@ function init(){
     mousey = e.pageY
   })
 
-  $("#add-frame").click(add_frame)
-  $("#frames").sortable({
-    start: drag_start,
-    stop: drag_stop
-  });
-  $(document).on("click","#frames .remove",remove_frame)
-  $("#framecount").change(function(){
-    var val = $(this).int()
-    if (val < 1 || isNaN(val)) $(this).val(val = 1)
-    if (val == 1) $("#add-frame").html("+add frame")
-    else $("#add-frame").html("+add frames")
-  })
   $("#background").change(function(){
     document.body.style.backgroundColor = $("#background").string()
   })
   
-  $("#frames").disableSelection();
-  $("#remove-all-frames").click(remove_all_frames)
-  $("#weave-frames").click(weave_frames)
-  $("#shuffle-frames").click(shuffle_frames)
-  $("#reverse-frames").click(reverse_frames)
-  $("#sort-frames").click(sort_frames)
-
-  $("#render").click(render)
-  $("#save").click(save)
-  $("#upload").click(upload)
+	frame_editor.init()
+
+  $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
   $("#help,#instructions .close").click(function(){ $("#instructions").toggle() })
   $("#instructions").draggable({
     start: drag_start,
@@ -181,7 +162,6 @@ function init(){
   $("#instructions").disableSelection();
 
   load()
-  $(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
 
   gallery.choose = choose
   gallery.init()
-- 
cgit v1.2.3-70-g09d2