diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/button.js | 2 | ||||
| -rw-r--r-- | client/effects.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/client/button.js b/client/button.js index 2916938..6691063 100644 --- a/client/button.js +++ b/client/button.js @@ -14,6 +14,7 @@ function animate() { // pixelate _.delay(function () { + $('h4.step').text('(Step 2)'); _.each(Session.get('photos'), function(x, i) { _.delay(function() { $('#img-'+x.id).hide() @@ -28,6 +29,7 @@ function animate() { // colorize _.delay(function() { + $('h4.step').text('(Step 3)'); _.each(Session.get('photos'), function(x, i) { _.delay(function () { $('#img-'+x.id).hide() diff --git a/client/effects.js b/client/effects.js index cacbc8e..fc425a1 100644 --- a/client/effects.js +++ b/client/effects.js @@ -140,8 +140,8 @@ Effects = (function() { var cols = Session.get(id + ':newcolors'); var palette = Session.get(id + ':palette'); - var g_p1 = Session.get('g_p1'); - var g_p2 = Session.get('g_p2'); + var g_p1 = new paper.Color(Session.get('g_p1')); + var g_p2 = new paper.Color(Session.get('g_p2')); var canvas = document.getElementById('canvas-' + id); var p = new paper.PaperScope(); |