Merge branch 'master' of lmno:ascii

1 files changed, 25 insertions, 13 deletions

diff --git a/js/clipboard.js b/js/clipboard.js
index b440ec9..93a5644 100644
--- a/js/clipboard.js
+++ b/js/clipboard.js
@@ -209,12 +209,20 @@ var clipboard = (function () {
       return output
     },
     
-    export_png: function () {
-      var palette = 'mirc'
-      var font = 'fixedsys'
+    export_png: function (done_fn) {
+      var opts = {
+        palette: 'mirc',
+        font: 'fixedsys',
+        fg: 0,
+        bg: 1,
+        canvas: clipboard.canvas
+      }
+      if (done_fn){
+        opts.done = done_fn
+      }
 
       var start = Date.now();
-      colorcode.to_canvas(canvas.mirc(), {canvas:clipboard.canvas, palette:palette, font:font})
+      colorcode.to_canvas(canvas.mirc(), opts)
       var total = Date.now() - start;
       console.log("took " + total)
     },
@@ -224,18 +232,22 @@ var clipboard = (function () {
     },
     
     save_png: function () {
-      clipboard.export_png()
-      var filename = clipboard.filename() + ".png"
-      var blob = dataUriToBlob(clipboard.canvas.toDataURL())
-      saveAs(blob, filename);
+      var save_fn = function(){
+        var filename = clipboard.filename() + ".png"
+        var blob = dataUriToBlob(clipboard.canvas.toDataURL())
+        saveAs(blob, filename);
+      }
+      clipboard.export_png(save_fn)
     },
     
     upload_png: function () {
-      clipboard.export_png()
-      var uri = clipboard.canvas.toDataURL()
-      var filename = clipboard.filename()
-      var tag = 'ascii'
-      upload(uri, filename, tag)
+      var upload_fn = function(){
+        var uri = clipboard.canvas.toDataURL()
+        var filename = clipboard.filename()
+        var tag = 'ascii'
+        upload(uri, filename, tag)
+      }
+      clipboard.export_png(upload_fn)
     },
 
   }