1 files changed, 10 insertions, 33 deletions
diff --git a/gif.html b/gif.html
index 221db89..b282a11 100644
--- a/gif.html
+++ b/gif.html
@@ -24,11 +24,16 @@
 <script type="text/javascript" src="js/vendor/gif-encode/tube.js"></script>
 <script type="text/javascript" src="js/vendor/gif-encode/client.js"></script>
 <script type="text/javascript" src="js/vendor/gif.js"></script>
-<script type="text/javascript" src="js/vendor/FileSaver.js"></script>
+<script type="text/javascript" src="js/vendor/FileSaver/FileSaver.js"></script>
 <script type="text/javascript" src="js/vendor/canvasquery.js"></script>
 <script type="text/javascript" src="js/canvasquery.dither.js"></script>
+<script type="text/javascript" src="js/util.js"></script>
 <script type="text/javascript">
 
+var algo = "random"
+var frames = []
+var lastGif;
+
 document.getElementById("url").onchange = load
 setTimeout(load)
 
@@ -37,39 +42,13 @@ function status (s){
   el.innerHTML = s + "..."
 }
 
-function load(imageURL) {
+function load () {
   document.getElementById("save").style.display = "none"
   status("loading")
-  var imageURL = proxify( document.getElementById("url").value );
-
-  if (imageURL.substr(-3) === "gif") {
-    window.gif = GIF(imageURL);
-    // gif.on("error", tryToLoadNextImage);
-    // gif.on("rendered", trackLoadTime);
-    gif.on("rendered", ready);
-    return gif.render();
-  } else {
-    window.img = new Image();
-    // img.addEventListener("error", tryToLoadNextImage);
-    img.addEventListener("load", ready);
-    img.crossOrigin = "anonymous";
-    return img.src = imageURL;
-  }
+  var imageURL = document.getElementById("url").value
+  loadImage(imageURL, ready)
 }
 
-function giveImage() {
-  if (imageURL.substr(-3) === "gif") {
-    return gif.frames[gif.currentFrame()].ctx.canvas;
-  } else {
-    return img;
-  }
-}
-
-function proxify (url) {
-  return "/cgi-bin/proxy?" + url // .replace(/^https?:\/\//, "");
-};
-
-
 function ready(){
   status("")
   var buttons = document.getElementsByTagName("button")
@@ -99,7 +78,6 @@ encoder.on("rendered-url", function(url){
   document.body.appendChild(image)
 })
 
-var lastGif;
 encoder.on("rendered", function(bits){
   status("")
   lastGif = bits
@@ -113,8 +91,7 @@ function save (){
   saveAs(blob, filename + "-" + algo + "-" + (+new Date() % 1000) + ".gif");
 }
 
-var algo = "random"
-var frames = []
+
 function build(){
   document.getElementById("save").style.display = "none"
   status("dithering")