solve some back end bugs

Former-commit-id: de26609879e875b21de329588ecd1dcb44d152f3 [formerly 78b120bf0d33345808a422980db55d33c52304b7] [formerly d77c47bb41c1a7bf6ee2b2522bf7c86638d087bc [formerly 2819ab24b85a578dc1f572f1e64eccc98cabd6c3]]
Former-commit-id: 3ddee564ddd5ed4fde01ed95f30386115a07df78 [formerly a3a1da0357874b7d99a88bd785c8f60f8170f663]
Former-commit-id: 0e15a59e28993f8178fa9409a466ce93a9936906

_assets/_old/js/common_old.js

@@ -75,22 +75,6 @@ buttons.setDone = function (name, success = true) {
  *            EVENTS           *
  *                             *
  * * * * * * * * * * * * * * * */
-function closePrompt (event) {
-  let prompt = document.querySelector('.prompt')
-
-  if (!prompt) return
-
-  if (typeof event !== 'undefined') {
-    event.preventDefault()
-  }
-
-  document.querySelector('.overlay').classList.remove('active')
-  prompt.classList.remove('active')
-
-  setTimeout(() => {
-    prompt.remove()
-  }, 100)
-}
 
 function notImplemented (event) {
   event.preventDefault()
@@ -194,26 +178,7 @@ function deleteEvent (event) {
  * * * * * * * * * * * * * * * */
 
 document.addEventListener('DOMContentLoaded', function (event) {
-  overlay = document.querySelector('.overlay')
-  clickOverlay = document.querySelector('#click-overlay')
 
-  buttons.logout = document.getElementById('logout')
-  buttons.delete = document.getElementById('delete')
-  buttons.previous = document.getElementById('previous')
-  buttons.info = document.getElementById('info')
-
-  // Attach event listeners
-  buttons.logout.addEventListener('click', logoutEvent)
-  buttons.info.addEventListener('click', infoEvent)
-
-  templates.question = document.querySelector('#question-template')
-  templates.info = document.querySelector('#info-template')
-  templates.message = document.querySelector('#message-template')
-  templates.move = document.querySelector('#move-template')
-
-  if (data.user.AllowEdit) {
-    buttons.delete.addEventListener('click', deleteEvent)
-  }
 
   let dropdownButtons = document.querySelectorAll('.action[data-dropdown]')
   Array.from(dropdownButtons).forEach(button => {
@@ -228,15 +193,6 @@ document.addEventListener('DOMContentLoaded', function (event) {
     })
   })
 
-  overlay.addEventListener('click', event => {
-    if (document.querySelector('.help.active')) {
-      closeHelp(event)
-      return
-    }
-
-    closePrompt(event)
-  })
-
   let mainActions = document.getElementById('main-actions')
 
   document.getElementById('more').addEventListener('click', event => {

_assets/src/App.vue

@@ -50,7 +50,7 @@
     <info-prompt v-show="showInfo" :class="{ active: showInfo }"></info-prompt>
     <help v-show="showHelp" :class="{ active: showHelp }"></help>
 
-    <div v-show="showOverlay()" class="overlay" :class="{ active: showOverlay() }"></div>
+    <div v-show="showOverlay()" @click="resetPrompts" class="overlay" :class="{ active: showOverlay() }"></div>
 
     <footer>Served with <a rel="noopener noreferrer" href="https://github.com/hacdias/caddy-filemanager">File Manager</a>.</footer>
   </div>
@@ -78,14 +78,18 @@ function updateColumnSizes () {
   items.style.width = `calc(${100 / columns}% - 1em)`
 }
 
+function resetPrompts () {
+  window.info.showHelp = false
+  window.info.showInfo = false
+  window.info.showDelete = false
+  window.info.showRename = false
+  window.info.showMove = false
+}
+
 window.addEventListener('keydown', (event) => {
   // Esc!
   if (event.keyCode === 27) {
-    window.info.showHelp = false
-    window.info.showInfo = false
-    window.info.showDelete = false
-    window.info.showRename = false
-    window.info.showMove = false
+    resetPrompts()
 
     // Unselect all files and folders.
     if (window.info.req.kind === 'listing') {
@@ -166,7 +170,8 @@ export default {
     showUpload: function () {
       if (this.req.kind === 'editor') return false
       return this.user.allowNew
-    }
+    },
+    resetPrompts: resetPrompts
   }
 }
 </script>