glib-web 0.6.2 → 0.6.9

package/utils/mime_type.js

@@ -0,0 +1,78 @@
+export default {
+  aac: "audio/aac",
+  abw: "application/x-abiword",
+  ai: "application/postscript",
+  arc: "application/octet-stream",
+  avi: "video/x-msvideo",
+  azw: "application/vnd.amazon.ebook",
+  bin: "application/octet-stream",
+  bz: "application/x-bzip",
+  bz2: "application/x-bzip2",
+  csh: "application/x-csh",
+  css: "text/css",
+  csv: "text/csv",
+  doc: "application/msword",
+  dll: "application/octet-stream",
+  eot: "application/vnd.ms-fontobject",
+  epub: "application/epub+zip",
+  gif: "image/gif",
+  htm: "text/html",
+  html: "text/html",
+  ico: "image/x-icon",
+  ics: "text/calendar",
+  jar: "application/java-archive",
+  jpeg: "image/jpeg",
+  jpg: "image/jpeg",
+  js: "application/javascript",
+  json: "application/json",
+  mid: "audio/midi",
+  midi: "audio/midi",
+  mp2: "audio/mpeg",
+  mp3: "audio/mpeg",
+  mp4: "video/mp4",
+  mpa: "video/mpeg",
+  mpe: "video/mpeg",
+  mpeg: "video/mpeg",
+  mpkg: "application/vnd.apple.installer+xml",
+  odp: "application/vnd.oasis.opendocument.presentation",
+  ods: "application/vnd.oasis.opendocument.spreadsheet",
+  odt: "application/vnd.oasis.opendocument.text",
+  oga: "audio/ogg",
+  ogv: "video/ogg",
+  ogx: "application/ogg",
+  otf: "font/otf",
+  png: "image/png",
+  ppt: "application/vnd.ms-powerpoint",
+  rar: "application/x-rar-compressed",
+  rtf: "application/rtf",
+  sh: "application/x-sh",
+  svg: "image/svg+xml",
+  swf: "application/x-shockwave-flash",
+  tar: "application/x-tar",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  ts: "application/typescript",
+  ttf: "font/ttf",
+  txt: "text/plain",
+  vsd: "application/vnd.visio",
+  wav: "audio/x-wav",
+  weba: "audio/webm",
+  webm: "video/webm",
+  webp: "image/webp",
+  woff: "font/woff",
+  woff2: "font/woff2",
+  xhtml: "application/xhtml+xml",
+  xls: "application/vnd.ms-excel",
+  xlsx: "application/vnd.ms-excel",
+  xlsx_OLD: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  xml: "application/xml",
+  xul: "application/vnd.mozilla.xul+xml",
+  "3gp": "video/3gpp",
+  "3gp_DOES_NOT_CONTAIN_VIDEO": "audio/3gpp",
+  "3gp2": "video/3gpp2",
+  "3gp2_DOES_NOT_CONTAIN_VIDEO": "audio/3gpp2",
+  "7z": "application/x-7z-compressed",
+  image: "image/*",
+  pdf: "application/pdf",
+  zip: "application/(zip|x-zip-compressed|octet-stream)"
+};

package/utils/private/ws.js

@@ -16,7 +16,7 @@ export default class {
       console.log(`Executing component action: ${methodName}`);
       component[`action_${methodName}`](payload);
     } else {
-      GLib.action.execute(payload, null, component);
+      GLib.action.execute(payload, component);
     }
   }
 }

package/utils/uploader.js

@@ -1,5 +1,6 @@
 import { DirectUpload } from "@rails/activestorage";
 import Type from "../utils/type";
+import mimeType from "../utils/mime_type";
 
 const MB_SIZE = 1000;
 
@@ -63,47 +64,19 @@ export default class Uploader {
 
   validateFile(spec) {
     return this.validateFileAccordingToRules(spec.accepts);
-
-    // if (Type.isString(spec.accepts)) {
-    //   if (spec.accepts) {
-    //     const acceptsRegex = new RegExp(spec.accepts);
-
-    //     if (!acceptsRegex.test(this.file.type)) {
-    //       alert("Invalid file type.");
-    //       return false;
-    //     }
-    //   }
-
-    //   if (spec.file_size_limit) {
-    //     if (this.file.size > spec.file_size_limit * MB_SIZE) {
-    //       alert(spec.file_size_limit_alert_text);
-    //       return false;
-    //     }
-    //   }
-    // } else {
-    //   return this.validateFileAccordingToRules(spec.accepts);
-    // }
-
-    // return true;
   }
 
   validateFileAccordingToRules(spec) {
     if (Type.isObject(spec)) {
-      let mimeType;
-      switch (spec.fileType) {
-        case "image/*": // Legacy
-        case "image":
-          mimeType = "image/*";
-          break;
-        case "pdf":
-          mimeType = "application/pdf";
-          break;
-        default:
-          return;
-      }
+      let validFileType = false;
+      [spec.fileType].flat().forEach(key => {
+        const acceptsRegex = new RegExp(mimeType[key]);
+        if (acceptsRegex.test(this.file.type)) {
+          validFileType = true;
+        }
+      });
 
-      const acceptsRegex = new RegExp(mimeType);
-      if (!acceptsRegex.test(this.file.type)) {
+      if (!validFileType) {
         alert(spec.fileTypeErrorText || "Invalid file type");
         return false;
       }