Просмотр исходного кода

#3509 - Integrate Filepond uploader instead of existing one as system uploader

RomanL 4 лет назад
Родитель
Сommit
87e6fbc216
2 измененных файлов с 14 добавлено и 4 удалено
  1. 1 1
      inc/classes/BxDolAlerts.php
  2. 13 3
      inc/js/classes/BxDolUploader.js

+ 1 - 1
inc/classes/BxDolAlerts.php

@@ -79,7 +79,7 @@ class BxDolAlerts extends BxDol
 
         $this->sUnit = $sUnit;
         $this->sAction = $sAction;
-        $this->iObject = (int)$iObjectId;
+        $this->iObject = $iObjectId;
         $this->aExtras = $aExtras;
         if (false === $iSender) {
             $oProfile = BxDolProfile::getInstance();

+ 13 - 3
inc/js/classes/BxDolUploader.js

@@ -423,7 +423,7 @@ BxDolUploaderSimple.prototype.getMimeTypefromString  = function (ext) {
         'xvid'   : 'video/xvid',
         
         'xwd'    : 'image/x-xwindowdump',
-        'zip'    : 'application/zip',
+        'zip'    : ['application/zip', 'application/x-zip-compressed']
        
     }
     return mimeTypes[ext.replace('.', '')];
@@ -537,8 +537,18 @@ function BxDolUploaderHTML5 (sUploaderObject, sStorageObject, sUniqId, options)
         if (o.acceptedFiles && o.acceptedFiles != ''){
             a = o.acceptedFiles.trim().split(/\s*,\s*/);
             a.forEach(function(item, i, arr) {
-                if ($this.getMimeTypefromString(item))
-                    aAcceptableFiles.push($this.getMimeTypefromString(item));
+                if ($this.getMimeTypefromString(item)){
+                    oT = $this.getMimeTypefromString(item);
+                    if (Array.isArray(oT)){
+                        oT.forEach(function(oTs, j, ar) {
+                            aAcceptableFiles.push(oTs);
+                        });
+                    }
+                    else{
+                        aAcceptableFiles.push(oT);
+                    }
+                }
+                    
             });
         }