general util.js

1 files changed, 10 insertions, 34 deletions

diff --git a/gif-animate.html b/gif-animate.html
index 55396cd..7c0b774 100644
--- a/gif-animate.html
+++ b/gif-animate.html
@@ -22,43 +22,22 @@
 <script type="text/javascript" src="js/vendor/gif.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 viewer;
+var raf_id;
+
 document.getElementById("url").onchange = load
 load()
 
-function load(imageURL) {
-  document.getElementById("loading").style.display = "inline"
-  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;
-  }
+function load(){
+  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(){
   document.getElementById("loading").style.display = "none"
   var buttons = document.getElementsByTagName("button")
@@ -74,9 +53,6 @@ function ready(){
   animate()
 }
 
-var algo = "random"
-var frames;
-var viewer;
 function build(){
   frames = []
 
@@ -88,6 +64,7 @@ function build(){
   viewer = cq(w, h)
   viewer.appendTo("#images")
 }
+
 function dither(frame){
   var canvas = frame.ctx.canvas
   var w = canvas.width, h = canvas.height;
@@ -97,7 +74,6 @@ function dither(frame){
   frames.push(cc)
 }
 
-var raf_id;
 function animate(){
   raf_id = requestAnimationFrame(animate)
   var canvas = frames[gif.currentFrame()].canvas