ccc

emnabs · Nov 9, 2017 · 04d6342 · 04d6342
1 parent f485af5
commit 04d6342
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/Plupload.php b/Plupload.php
@@ -42,16 +42,7 @@ class Plupload extends InputWidget {
     public $previewOptions = ['class' => 'plupload_preview'];
     public $containerOptions = ['class' => 'plupload_container'];
     //
-    public $options = [
-        'filters' => [
-            'mime_types' => [
-                [
-                    'title' => "Image files",
-                    'extensions' => "jpg,gif,png"
-                ],
-            ]
-        ],
-    ];
+    public $options = [];
     public $autoUpload = true;
     public $showUploadProgress = true;
     public $chunk_size = 0;
@@ -230,11 +221,18 @@ public function registerAssets() {
                 'list' => true,
                 'thumbs' => true,
                 'active' => 'thumbs'
-            ]
+            ],
+            'filters' => [
+                'mime_types' => [
+                    [
+                        'title' => "Image files",
+                        'extensions' => "jpg,gif,png"
+                    ],
+                ]
+            ],
         ];
 
-        $options = ArrayHelper::merge($defaultOptions, $this->options);
-        $options = Json::encode($options);
+        $options = Json::encode(ArrayHelper::merge($defaultOptions, $this->options));
 
         $scripts = implode("\n", [
             "var {$this->id} = new plupload.Uploader({$options});",

diff --git a/PluploadAsset.php b/PluploadAsset.php
@@ -42,7 +42,6 @@ class PluploadAsset extends AssetBundle {
      */
     public $depends = [
         'yii\web\JqueryAsset',
-        'yii\bootstrap\BootstrapAsset',
     ];
 
     /**