From 593acc4b42908ccfbd56257cf919642e4a76569c Mon Sep 17 00:00:00 2001
From: Michal Tomaszewski <michalt48@gmail.com>
Date: Thu, 26 Apr 2018 17:03:07 -0700
Subject: [PATCH] =?UTF-8?q?=E2=80=98open-assets=E2=80=99=20-=20Simplify=20?=
 =?UTF-8?q?by=20adding=20an=20=E2=80=98accept=E2=80=99=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/asset_manager/model/AssetImage.js         |  1 -
 src/commands/view/OpenAssets.js               | 13 +++++--------
 src/dom_components/view/ComponentImageView.js |  1 +
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js
index 52cacfbb2..286c83e37 100644
--- a/src/asset_manager/model/AssetImage.js
+++ b/src/asset_manager/model/AssetImage.js
@@ -8,5 +8,4 @@ module.exports = Asset.extend({
     height: 0,
     width: 0
   },
-  fileTypes: ['image/*']
 });
diff --git a/src/commands/view/OpenAssets.js b/src/commands/view/OpenAssets.js
index a87550916..238ec3d8a 100644
--- a/src/commands/view/OpenAssets.js
+++ b/src/commands/view/OpenAssets.js
@@ -7,32 +7,29 @@ module.exports = {
     const config = am.getConfig();
     const title = opts.modalTitle || config.modalTitle || '';
     var types = opts.types;
+    var accept = opts.accept;
 
     am.setTarget(opts.target);
     am.onClick(opts.onClick);
     am.onDblClick(opts.onDblClick);
     am.onSelect(opts.onSelect);
 
-    if (!this.rendered || types) {
+    if (!this.rendered || types || accept) {
       var $html;
       var assets;
-      var fileTypes = [];
 
       if (types) {
         assets = am.getAll().filter(asset => {
           return types.indexOf(asset.get('type')) != -1
         });
-
-        types.forEach((type, i) => {
-          fileTypes = fileTypes.concat((am.getType(type).model.prototype.fileTypes || ['*/*']));
-        })
       } else {
         assets = am.getAll();
-        fileTypes = '*/*';
       }
 
       $html = $(am.render(assets));
-      $html.find(`input#${config.stylePrefix}uploadFile`).attr('accept', $.unique(fileTypes).map((ext, i) => { return ext }).join(','));
+
+      if (accept) $html.find(`input#${config.stylePrefix}uploadFile`).attr('accept', accept);
+
       this.rendered = 1;
     }
 
diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js
index 6cb9940b9..d7a2cecd8 100644
--- a/src/dom_components/view/ComponentImageView.js
+++ b/src/dom_components/view/ComponentImageView.js
@@ -68,6 +68,7 @@ module.exports = ComponentView.extend({
       editor.runCommand('open-assets', {
         target: this.model,
         types: ['image'],
+        accept: 'image/*',
         onSelect() {
           editor.Modal.close();
           editor.AssetManager.setTarget(null);