resolve merge conflicts, lint compliance

2019-08-16 16:02:10 +02:00
parent c9569a136d 79b667c835
commit bf3e638adc
8 changed files with 215 additions and 7 deletions
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -367,7 +367,7 @@ define([
            blobToArrayBuffer(file, function (e, buffer) {
                if (e) { console.error(e); }
                file_arraybuffer = buffer;
-                if (!Thumb.isSupportedType(file.type)) { return getName(); }
+                if (!Thumb.isSupportedType(file)) { return getName(); }
                // make a resized thumbnail from the image..
                Thumb.fromBlob(file, function (e, thumb64) {
                    if (e) { console.error(e); }