From b4fa8133e0f8786e2dda7f294e0ddd695ea902b3 Mon Sep 17 00:00:00 2001
From: Eugene Terentev <eugene@terentev.net>
Date: Tue, 7 Apr 2015 22:19:37 +0300
Subject: [PATCH] fixes #23

---
 src/widget/Upload.php              |  9 +++++----
 src/widget/assets/js/upload-kit.js | 14 ++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/widget/Upload.php b/src/widget/Upload.php
index 21c3b49..09cf6b9 100644
--- a/src/widget/Upload.php
+++ b/src/widget/Upload.php
@@ -84,10 +84,11 @@ public function init()
             $this->clientOptions,
             [
                 'url' => Url::to($this->url),
-                'multiple'=>$this->multiple,
-                'sortable'=>$this->sortable,
-                'maxNumberOfFiles'=>$this->maxNumberOfFiles,
-                'maxFileSize'=>$this->maxFileSize,
+                'multiple' => $this->multiple,
+                'sortable' => $this->sortable,
+                'maxNumberOfFiles' => $this->maxNumberOfFiles,
+                'maxFileSize' => $this->maxFileSize,
+                'acceptFileTypes' => $this->acceptFileTypes,
                 'files' => $this->files
             ]
         );
diff --git a/src/widget/assets/js/upload-kit.js b/src/widget/assets/js/upload-kit.js
index 6ac6a8a..cc684bf 100644
--- a/src/widget/assets/js/upload-kit.js
+++ b/src/widget/assets/js/upload-kit.js
@@ -35,10 +35,10 @@
                     .after($('<span class="glyphicon glyphicon-circle-arrow-down drag"></span>'))
                     .after($('<span/>', {"data-toggle":"popover", "class":"glyphicon glyphicon-exclamation-sign error-popover"}))
                     .after(
-                        '<div class="progress">'+
-                        '<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>'+
-                        '</li>'
-                    );
+                    '<div class="progress">'+
+                    '<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>'+
+                    '</li>'
+                );
                 $files.on('click', '.upload-kit-item .remove', methods.removeItem);
                 methods.checkInputVisibility();
                 methods.fileuploadInit();
@@ -55,7 +55,9 @@
                     multiple: options.multiple,
                     maxNumberOfFiles: options.maxNumberOfFiles,
                     maxFileSize: options.maxFileSize, // 5 MB
-                    acceptFileTypes: options.acceptFileTypes,
+                    acceptFileTypes: options.acceptFileTypes
+                        ? new RegExp(options.acceptFileTypes)
+                        : null,
                     process: true,
                     getNumberOfFiles: methods.getNumberOfFiles,
                     start: function (e, data) {
@@ -65,7 +67,7 @@
                     },
                     processfail: function(e, data) {
                         if (data.files.error) {
-                            methods.showError(data.files[0].file.error);
+                            methods.showError(data.files[0].error);
                         }
                     },
                     progressall: function (e, data) {