Merge pull request #38 from CulturalMe/meteor-slingshot-34

Tolerate missing file type.
CulturalMe · Jan 4, 2015 · 32e1a64 · 32e1a64
2 parents 8f3563b + b4c37d1
commit 32e1a64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/directive.js b/lib/directive.js
@@ -38,7 +38,7 @@
  *
  * @property {String} name
  * @property {Number} size - File-size in bytes.
- * @property {String} type - mime type.
+ * @property {String} [type] - mime type.
  *
  */
 
@@ -198,17 +198,20 @@ Meteor.methods({
   "slingshot/uploadRequest": function (directiveName, file, meta) {
     check(directiveName, String);
     check(file, {
-      type: Match.Where(function (type) {
+      type: Match.Optional(Match.Where(function (type) {
         check(type, String);
-        return /^[^\/]+\/[^\/]+$/.test(type);
-      }),
+        return !type || /^[^\/]+\/[^\/]+$/.test(type);
+      })),
       name: String,
       size: Match.Where(function (size) {
         check(size, Number);
         return size >= 0;
       })
     });
 
+    if (!file.type)
+      delete file.type;
+
     check(meta, Match.Optional(Match.OneOf(Object, null)));
 
     var directive = Slingshot.getDirective(directiveName);

diff --git a/lib/upload.js b/lib/upload.js
@@ -226,8 +226,7 @@ Slingshot.Upload = function (directive, metaData) {
         var download = self.instructions.download;
 
         if (preload && preloaded.get() !== download) {
-          preloadImage(download, function (event) {
-            console.log(event);
+          preloadImage(download, function () {
             preloaded.set(download);
           });
         }
@@ -281,8 +280,6 @@ Slingshot.Upload = function (directive, metaData) {
  */
 
 function preloadImage(image, callback) {
-  console.log("preloading", image);
-
   var preloader = new window.Image();
 
   preloader.onload = callback;