Merge pull request #363 from therewasaguy/io

saveCanvas() figures out file extension

Author: Lauren McCarthy

examples/p5.Image/saving-images.js

@@ -8,7 +8,7 @@ function setup() {
 
     setTimeout(function(){
       console.log("Save image")
-      save(img, "unicorn.png");
+      save(img, "unicorn.jpeg");
     }, 1000);
 
   });

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.5 September 09, 2014 */
+/*! p5.js v0.3.5 September 10, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -3579,7 +3579,7 @@ var outputfiles = function (require, core) {
           } else if (args[0] instanceof p5.Table) {
             p5.prototype.saveTable(args[0], args[1], args[2], args[3]);
           } else if (args[0] instanceof p5.Image) {
-            p5.prototype.saveCanvas(args[0].canvas, args[1], args[2]);
+            p5.prototype.saveCanvas(args[0].canvas, args[1]);
           } else if (args[0] instanceof p5.SoundFile) {
             p5.prototype.saveSound(args[0], args[1], args[2], args[3]);
           } else if (args[0] instanceof Object) {
@@ -3718,11 +3718,12 @@ var outputfiles = function (require, core) {
       if (!extension) {
         extension = '';
       }
+      if (!filename) {
+        filename = 'untitled';
+      }
       var ext = '';
-      if (filename) {
+      if (filename && filename.indexOf('.') > -1) {
         ext = filename.split('.').pop();
-      } else {
-        filename = 'untitled';
       }
       if (extension) {
         if (ext !== extension) {
@@ -3735,6 +3736,7 @@ var outputfiles = function (require, core) {
         ext
       ];
     }
+    p5.prototype._checkFileExtension = _checkFileExtension;
     p5.prototype._isSafari = function () {
       var x = Object.prototype.toString.call(window.HTMLElement);
       return x.indexOf('Constructor') > 0;
@@ -3749,6 +3751,12 @@ var outputimage = function (require, core) {
     var p5 = core;
     var frames = [];
     p5.prototype.saveCanvas = function (_cnv, filename, extension) {
+      if (!extension) {
+        extension = p5.prototype._checkFileExtension(filename, extension)[1];
+        if (extension === '') {
+          extension = 'png';
+        }
+      }
       var cnv;
       if (_cnv) {
         cnv = _cnv;
@@ -3764,7 +3772,7 @@ var outputimage = function (require, core) {
         window.location.href = cnv.toDataURL();
       } else {
         var mimeType;
-        if (!extension) {
+        if (typeof extension === 'undefined') {
           extension = 'png';
           mimeType = 'image/png';
         } else {

lib/p5.min.js

@@ -215,7 +215,7 @@ define(function (require) {
           p5.prototype.saveTable(args[0], args[1], args[2], args[3]);
         }
         else if (args[0] instanceof p5.Image) {
-          p5.prototype.saveCanvas(args[0].canvas, args[1], args[2]);
+          p5.prototype.saveCanvas(args[0].canvas, args[1]);
         }
         else if (args[0] instanceof p5.SoundFile) {
           p5.prototype.saveSound(args[0], args[1], args[2], args[3]);
@@ -520,12 +520,13 @@ define(function (require) {
     if (!extension) {
       extension = '';
     }
+    if (!filename) {
+      filename = 'untitled';
+    }
     var ext = '';
     // make sure the file will have a name, see if filename needs extension
-    if (filename) {
+    if (filename && filename.indexOf('.') > -1) {
       ext = filename.split('.').pop();
-    } else {
-      filename = 'untitled';
     }
     // append extension if it doesn't exist
     if (extension) {
@@ -536,6 +537,7 @@ define(function (require) {
     }
     return [filename, ext];
   }
+  p5.prototype._checkFileExtension = _checkFileExtension;
 
   /**
    *  Returns true if the browser is Safari, false if not.

src/output/files.js

@@ -17,6 +17,12 @@ define(function (require) {
    *                             specific html5 canvas (optional).
    */
   p5.prototype.saveCanvas = function(_cnv, filename, extension) {
+    if (!extension) {
+      extension = p5.prototype._checkFileExtension(filename, extension)[1];
+      if (extension === '') {
+        extension = 'png';
+      }
+    }
     var cnv;
     if (_cnv) {
       cnv = _cnv;
@@ -33,7 +39,7 @@ define(function (require) {
       window.location.href = cnv.toDataURL();
     } else {
       var mimeType;
-      if (!extension) {
+      if (typeof(extension) === 'undefined') {
         extension = 'png';
         mimeType = 'image/png';
       }