diff options
| author | jules <jules@okfoc.us> | 2014-01-26 04:25:35 -0500 |
|---|---|---|
| committer | jules <jules@okfoc.us> | 2014-01-26 04:25:35 -0500 |
| commit | c3470d02a57396e92a71d3cfb072e655ccb51780 (patch) | |
| tree | 53f069368c0e172f9c72e250e1cdaeeaa5ae4def | |
| parent | beb6a880100835aa44b8508a03b3b0b63562055a (diff) | |
examples placeholder
| -rw-r--r-- | js/image.js | 3 | ||||
| -rw-r--r-- | js/render.js | 2 | ||||
| -rw-r--r-- | shader-combo.html | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/js/image.js b/js/image.js index aabab89..1f36473 100644 --- a/js/image.js +++ b/js/image.js @@ -1,4 +1,5 @@ var gif, img +var imageURL = null function loadImage(imageURL, callback) { var imageURL = proxify( imageURL ); @@ -37,7 +38,7 @@ function giveImage(t) { function proxify (url) { if (url.indexOf("http") == 0) - return "/cgi-bin/proxy?" + url // .replace(/^https?:\/\//, ""); + return "/cgi-bin/proxy?" + url.replace(/^https?:\/\//, ""); else return url } diff --git a/js/render.js b/js/render.js index cfc2d81..4de7329 100644 --- a/js/render.js +++ b/js/render.js @@ -2,10 +2,8 @@ var frame, img_frame; var timeout, raf_id, start_t = 0, old_t = 0, pause_t = 0 var paused = false, dragging = false, rendering = false, scrolling = false, deferring = false, scrollTimeout = null var fps = 30 -var imageURL = "" function choose (){ - imageURL = this.src loading = true $("#url").val(imageURL) loadImage(imageURL, ready) diff --git a/shader-combo.html b/shader-combo.html index f51037b..5b218a6 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -59,6 +59,9 @@ form { display: inline-block; } <div id="header"> <button id="help">help</button> <button id="new-shader"><b>new shader</b></button> + <select id="examples"> + <option>examples</option> + </select> <!-- <input type="text" id="shader-id" disabled><button id="fetch-info" disabled>info</button> <button id="fetch-history" disabled>history</button> |