Merge pull request #424 from JemyCheung/master

repair mimeType

Author: bachue

src/upload.js

@@ -5,7 +5,7 @@ import {
   setLocalFileInfo,
   removeLocalFileInfo,
   getLocalFileInfo,
-  isContainFileMimeType,
+  findMimeType,
   sum,
   getDomainFromUrl,
   getPortFromUrl,
@@ -65,11 +65,14 @@ export class UploadManager {
       this.putExtra.fname = this.file.name;
     }
     if (this.putExtra.mimeType && this.putExtra.mimeType.length) {
-      if (!isContainFileMimeType(this.file.type, this.putExtra.mimeType)){
-        let err = new Error("file type doesn't match with what you specify");
-        this.onError(err);
-        return;
-      }
+      var compareMimeType = findMimeType(this.file.type, this.putExtra.mimeType);
+      if (compareMimeType == null || compareMimeType == undefined) {
+         let err = new Error("file type doesn't match with what you specify");
+         this.onError(err);
+         return;
+       } else {
+         this.putExtra.mimeType = [compareMimeType];
+       }
     }
     let upload = getUploadUrl(this.config, this.token).then(res => {
       this.uploadUrl = res;

src/utils.js

@@ -264,9 +264,10 @@ function getUpHosts(token) {
   }
 }
 
-
-export function isContainFileMimeType(fileType, mimeType){
-  return mimeType.indexOf(fileType) > -1;
+export function findMimeType(fileType, mimeType) {
+  return mimeType.find((elem) => {
+      return fileType == elem;
+  });
 }
 
 export function createObjectURL(file) {