From ca54447f7e6c1b3d662ba83855f22814c0c1e98b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 18 Mar 2022 14:51:33 +0100
Subject: [PATCH] update file-manager with data-modal-create attribute

---
 .../js/components/file-manager/Files.vue       | 18 +++++++++---------
 src/core/Resources/assets/js/modules/editor.js |  2 +-
 .../Resources/assets/js/modules/file-picker.js |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/core/Resources/assets/js/components/file-manager/Files.vue b/src/core/Resources/assets/js/components/file-manager/Files.vue
index 016a1a7..81967e3 100644
--- a/src/core/Resources/assets/js/components/file-manager/Files.vue
+++ b/src/core/Resources/assets/js/components/file-manager/Files.vue
@@ -14,11 +14,11 @@
 
             <div class="d-flex">
                 <div class="breadcrumb mb-0 file-manager-actions">
-                    <span class="btn btn-sm btn-primary ml-1" v-bind:data-modal="generateUploadLink(directory)">
-                        <span class="fa fa-upload" v-bind:data-modal="generateUploadLink(directory)"></span>
+                    <span class="btn btn-sm btn-primary ml-1" v-bind:data-modal="generateUploadLink(directory)" data-modal-create>
+                        <span class="fa fa-upload" v-bind:data-modal="generateUploadLink(directory)" data-modal-create></span>
                     </span>
-                    <span class="btn btn-sm btn-primary ml-1" v-bind:data-modal="generateNewDirectoryLink(directory)">
-                        <span class="fa fa-folder-plus" v-bind:data-modal="generateNewDirectoryLink(directory)"></span>
+                    <span class="btn btn-sm btn-primary ml-1" v-bind:data-modal="generateNewDirectoryLink(directory)" data-modal-create>
+                        <span class="fa fa-folder-plus" v-bind:data-modal="generateNewDirectoryLink(directory)" data-modal-create></span>
                     </span>
                 </div>
 
@@ -58,7 +58,7 @@
 
             <div v-for="item in directories" class="card mt-3 ml-3 mb-3 border-0">
                 <div class="card-body p-2">
-                    <div class="card-text" v-on:dblclick="setDirectory(item.path)" v-bind:data-modal="generateInfoLink(item, true, context)">
+                    <div class="card-text" v-on:dblclick="setDirectory(item.path)" v-bind:data-modal="generateInfoLink(item, true, context)" data-modal-create>
                         <div class="text-center">
                             <div class="display-4 text-warning">
                                 <span class="fa fa-folder"></span>
@@ -77,7 +77,7 @@
                     </div>
                 </div>
             </div>
-            <div v-for="item in files" class="card mt-3 ml-3 mb-3 border-0" v-on:click="modalUrl = generateInfoLink(item, null, context)" v-bind:data-modal="generateInfoLink(item, null, context)">
+            <div v-for="item in files" class="card mt-3 ml-3 mb-3 border-0" v-on:click="modalUrl = generateInfoLink(item, null, context)" v-bind:data-modal="generateInfoLink(item, null, context)" data-modal-create>
                 <div class="card-body p-2">
                     <div class="card-text">
                         <div class="text-center">
@@ -111,7 +111,7 @@
                     </td>
                 </tr>
 
-                <tr v-for="item in directories" v-on:dblclick="setDirectory(item.path)" v-bind:data-modal="generateInfoLink(item, true, context)">
+                <tr v-for="item in directories" v-on:dblclick="setDirectory(item.path)" v-bind:data-modal="generateInfoLink(item, true, context)" data-modal-create>
                     <td width="10">
                         <span class="fa fa-folder text-warning"></span>
                     </td>
@@ -129,7 +129,7 @@
                     <td width="10">
                         <FileIcon v-bind:mime="item.mime" v-bind:path="item.webPath" v-bind:thumb="false" />
                     </td>
-                    <td v-on:click="modalUrl = generateInfoLink(item, null, context)" v-bind:data-modal="generateInfoLink(item, null, context)">
+                    <td v-on:click="modalUrl = generateInfoLink(item, null, context)" v-bind:data-modal="generateInfoLink(item, null, context)" data-modal-create>
                         <div v-if="item.locked" class="float-right">
                             <span class="btn btn-sm btn-light">
                                 <span class="fa fa-lock"></span>
@@ -352,7 +352,7 @@ export default {
 
     $(events).each((k, event) => {
       body.on(event + '.success', () => {
-        $('#modal-container').modal('hide')
+        $('div[id^=modal-container]').modal('hide')
         that.refresh()
       })
     })
diff --git a/src/core/Resources/assets/js/modules/editor.js b/src/core/Resources/assets/js/modules/editor.js
index 7bfba77..2eb9bca 100644
--- a/src/core/Resources/assets/js/modules/editor.js
+++ b/src/core/Resources/assets/js/modules/editor.js
@@ -36,7 +36,7 @@ const fileManagerBrowser = function (callback) {
 
   const clickCallback = (e) => {
     callback($(e.target).attr('data-value'), {})
-    $('#modal-container').modal('hide')
+    $('div[id^="modal-container"]').modal('hide')
     container.modal('hide')
 
     $('body').off('click', '#file-manager-insert', clickCallback)
diff --git a/src/core/Resources/assets/js/modules/file-picker.js b/src/core/Resources/assets/js/modules/file-picker.js
index 1686ffb..d537a23 100644
--- a/src/core/Resources/assets/js/modules/file-picker.js
+++ b/src/core/Resources/assets/js/modules/file-picker.js
@@ -36,7 +36,7 @@ const fileManagerBrowser = function (callback) {
 
   const clickCallback = (e) => {
     callback($(e.target).attr('data-value'), {})
-    $('#modal-container').modal('hide')
+    $('div[id^="modal-container-"]').modal('hide')
     container.modal('hide')
 
     $('body').off('click', '#file-manager-insert', clickCallback)