summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-01-21 15:47:03 -0500
committerjules <jules@okfoc.us>2014-01-21 15:47:03 -0500
commit39f5be06a0121207903d0ac156c271741c8d6448 (patch)
tree9bf91394ae8d2dcb5605489e6dbe727154c0eeda
parenta8d29719e15d685f7dc0ad0029f3e85c8c7efceb (diff)
prepend
-rw-r--r--js/api/set.js12
-rw-r--r--shader-api.html22
2 files changed, 24 insertions, 10 deletions
diff --git a/js/api/set.js b/js/api/set.js
index 6c6c917..3c165bf 100644
--- a/js/api/set.js
+++ b/js/api/set.js
@@ -19,7 +19,13 @@ function save_shader(){
if (! shader_id_root) {
shader_id_root = data.id;
}
-
+
+ params.id = data.id;
+ params.thumbnail_url = "http://i.asdf.us/im/9a/chtiny3_1334529294_1334529329.gif";
+
+ $shader = display_shader(param)
+ $("#shader-gallery").prepend($shader)
+
var blob = dataUriToBlob(cc.clone().resize(200,200).canvas.toDataURL("image/png"))
var form = new FormData();
@@ -32,6 +38,10 @@ function save_shader(){
processData: false,
contentType: false,
}).done(function(resp){
+ if (resp.success) {
+ vardata = JSON.parse(resp)
+ $shader.find("img").src(data.url)
+ }
console.log(resp);
});
diff --git a/shader-api.html b/shader-api.html
index 0f7ca67..5225060 100644
--- a/shader-api.html
+++ b/shader-api.html
@@ -94,6 +94,8 @@ a { color: #00f; }
var cc = cq(0,0).appendTo("#workspace")
var w, h
var firsttime = true
+var shader_gallery_template = $("#shader-gallery-template").html()
+
$(init)
@@ -142,17 +144,9 @@ function init(){
}
function load_shaders(err, shaders){
var $el = $("#shader-gallery").empty()
- var template = $("#shader-gallery-template").html()
for (var i in shaders) {
- var $shader = $("<div>").addClass("shader")
- $shader.data("shader", shaders[i])
- var html = template
- for (var field in shaders[i]) {
- html = html.replace("{" + field + "}", shaders[i][field])
- }
- $shader.html(html)
-
+ var $shader = display_shader(shaders[i])
$el.append( $shader )
}
if (firsttime) {
@@ -160,6 +154,16 @@ function load_shaders(err, shaders){
run(shaders[0])
}
}
+function display_shader(shader_object){
+ var $shader = $("<div>").addClass("shader")
+ $shader.data("shader", shader_object)
+ var html = shader_gallery_template
+ for (var field in shader_object) {
+ html = html.replace("{" + field + "}", shader_object[field])
+ }
+ $shader.html(html)
+ return $shader;
+}
function run(shader_object){
console.log(shader_object)
shader_id_root = shader_object.shader_id