Updated renderings

henrypoydar · Aug 5, 2009 · 83c0fae · 83c0fae
1 parent 15e64eb
commit 83c0fae
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 40 deletions.
diff --git a/README.mdown b/README.mdown
@@ -26,6 +26,7 @@ The [Processing.js](http://processingjs.org) Javascript extension is used to dis
 
 * Sketches to include attached images
 * Separate production deploy
+* Preview on creation
 * Endless pagination
 * Start/stop animated documents
 * Image uploading

diff --git a/_attachments/views/home.html b/_attachments/views/home.html
@@ -6,5 +6,5 @@
 
 <p class="about">
   <b>What's going on here?</b>
-  This is a simple study in non-repeated form, shape, color and animation. Art from code, code from art. The <a href="http://www.processing.org">Processing</a> programming language and <a href="http://www.processingjs.org">Processing.js</a> Javascript extension are used to generate unique renderings based on template sketches. Bothe the template sketches and resulting renderings are stored in <a href="http://couchdb.apache.org/">CouchDB</a> documents. <a href="#/credits">Lots of other neat-o technologies and libraries</a> are also used here.
+  This is a simple study in non-repeated form, shape, color and animation. The <a href="http://www.processing.org">Processing</a> programming language and <a href="http://www.processingjs.org">Processing.js</a> Javascript extension are used to generate unique renderings based on template sketches. Both the template sketches and resulting renderings are stored as <a href="http://couchdb.apache.org/">CouchDB</a> documents. <a href="#/credits">Lots of other neat-o technologies and libraries</a> are also used here.
 </p>
diff --git a/_attachments/views/renderings/show.html b/_attachments/views/renderings/show.html
@@ -4,7 +4,7 @@
 </div>
 
 <p class="caption">
-  <%= item.template_algorithm.name %>
+  <%= item.sketch.name %>
   <br />
   <%= timestamp %>
   <br />
@@ -24,6 +24,6 @@
 
 <div class="source_code">
   <pre>
-<%= item.template_algorithm.code %>
+<%= item.sketch.code %>
   </pre>
 </div>
diff --git a/lib/javascripts/application.js b/lib/javascripts/application.js
@@ -2,7 +2,7 @@ $(document).ready(function() {
   $('#flash').click(function() { $(this).fadeOut('fast'); });
   $('a.toggle_grid').live("click", function() { $('.overlay').toggleClass('grid'); });
   $('a.toggle_palette').live("click", function() { $('ul.palette').toggle(); });
-  $('a.toggle_source').live("click", function() { $('.source').toggle(); });
+  $('a.toggle_source').live("click", function() { $('.source_code').toggle(); });
 
   $('input.preview').live("click", function() {
     $('canvas.preview').each(function() {

diff --git a/lib/javascripts/controller.js b/lib/javascripts/controller.js
@@ -196,45 +196,48 @@
         var ctx = this;
         var tid = ctx.params['sketch_id'];
 
-        var thumbnail_canvas = scaleCanvas($('canvas#view')[0],150,120);
-        var palette_canvas = scaleCanvas($('canvas#view')[0],15,12);
-
-        couchapp.db.saveDoc(
-          {
-            type: 'rendering',
-            created_at: new Date().toJSON(),
-            sketch_algorithm: {
-              file: APP_DATA.sketch_algorithms[tid].file,
-              name: APP_DATA.sketch_algorithms[tid].name,
-              code: $.ajax({ 
-                url: ('processing/' + APP_DATA.sketch_algorithms[tid].file),
-                async: false
-              }).responseText
-            },
-            "_attachments": {
-              "rendering.png": {
-                "content_type": "image\/png", "data": encodeCanvas($('canvas#view')[0])
-              },
-              "thumbnail.png": {
-                "content_type": "image\/png", "data": encodeCanvas(thumbnail_canvas)
-              },
-              "palette.png": {
-                "content_type": "image\/png", "data": encodeCanvas(palette_canvas)
-              }
-            },
-            palette: hexPaletteFromCanvas(palette_canvas)
-          }, {
+        couchapp.db.openDoc(tid, {
           success: function(json) {
-            //console.log('stored doc: ', json)
-            flash = { 
-              message: "Stored a rendering of '" + APP_DATA.sketch_algorithms[tid].name + 
-                "' - <a href='#/rendering/" + json.id + "'>view</a>",
-              css_class: "success"
-            };
-            ctx.redirect('#/renderings');
+            //console.log(json);
+            var thumbnail_canvas = scaleCanvas($('canvas#view')[0],150,120);
+            var palette_canvas = scaleCanvas($('canvas#view')[0],15,12);
+            couchapp.db.saveDoc(
+              {
+                type: 'rendering',
+                created_at: new Date().toJSON(),
+                sketch: {
+                  name: json.name,
+                  code: json.code,
+                  id: json._id,
+                  revision: json._rev
+                },
+                "_attachments": {
+                  "rendering.png": {
+                    "content_type": "image\/png", "data": encodeCanvas($('canvas#view')[0])
+                  },
+                  "thumbnail.png": {
+                    "content_type": "image\/png", "data": encodeCanvas(thumbnail_canvas)
+                  },
+                  "palette.png": {
+                    "content_type": "image\/png", "data": encodeCanvas(palette_canvas)
+                  }
+                },
+                palette: hexPaletteFromCanvas(palette_canvas)
+              }, {
+              success: function(jsonb) {
+                //console.log('stored doc: ', json)
+                flash = { 
+                  message: "Stored a rendering of '" + json.name + 
+                    "' - <a href='#/rendering/" + jsonb.id + "'>view</a>",
+                  css_class: "success"
+                };
+                ctx.redirect('#/renderings');
+              }
+            });
+
           }
         });
-        
+
       });
 
       get('#/credits', function() {