Merge pull request #1072 from CliffyPrime/german_update

[bookstack] / resources / assets / js / vues / image-manager.js

diff --git a/resources/assets/js/vues/image-manager.js b/resources/assets/js/vues/image-manager.js
index 2a11a6ff2eb9c6b7c77f60bc31ad6264adc23b12..6bfc2662df250a66f6d221308dcd04ebb88d1500 100644 (file)
--- a/resources/assets/js/vues/image-manager.js
+++ b/resources/assets/js/vues/image-manager.js
@@ -1,4 +1,5 @@
-const dropzone = require('./components/dropzone');
+import * as Dates from "../services/dates";
+import dropzone from "./components/dropzone";
 
 let page = 0;
 let previousClickTime = 0;
@@ -24,9 +25,6 @@ const data = {
     searching: false,
     searchTerm: '',
 
-    revisions: [],
-    selectedRevision: null,
-
     imageUpdateSuccess: false,
     imageDeleteSuccess: false,
     deleteConfirm: false,
@@ -50,9 +48,11 @@ const methods = {
     },
 
     hide() {
+        if (this.$refs.dropzone) {
+            this.$refs.dropzone.onClose();
+        }
         this.showing = false;
         this.selectedImage = false;
-        this.$refs.dropzone.onClose();
         this.$el.children[0].components.overlay.hide();
     },
 
@@ -102,6 +102,7 @@ const methods = {
     },
 
     cancelSearch() {
+        if (!this.searching) return;
         this.searching = false;
         this.searchTerm = '';
         this.images = preSearchImages;
@@ -113,8 +114,6 @@ const methods = {
         let currentTime = Date.now();
         let timeDiff = currentTime - previousClickTime;
         let isDblClick = timeDiff < dblClickTime && image.id === previousClickImage;
-        this.revisions = [];
-        this.selectedRevision = null
 
         if (isDblClick) {
             this.callbackAndHide(image);
@@ -122,11 +121,6 @@ const methods = {
             this.selectedImage = image;
             this.deleteConfirm = false;
             this.dependantPages = false;
-            if (this.imageType === 'drawio') {
-                this.$http.get(window.baseUrl(`/images/revisions/${image.id}`)).then(resp => {
-                    this.revisions = resp.data;
-                })
-            }
         }
 
         previousClickTime = currentTime;
@@ -165,8 +159,8 @@ const methods = {
             });
             return;
         }
-
-        this.$http.delete(`/images/${this.selectedImage.id}`).then(resp => {
+        let url = window.baseUrl(`/images/${this.selectedImage.id}`);
+        this.$http.delete(url).then(resp => {
             this.images.splice(this.images.indexOf(this.selectedImage), 1);
             this.selectedImage = false;
             this.$events.emit('success', trans('components.image_delete_success'));
@@ -175,18 +169,13 @@ const methods = {
     },
 
     getDate(stringDate) {
-        return new Date(stringDate);
+        return Dates.formatDateTime(new Date(stringDate));
     },
 
     uploadSuccess(event) {
         this.images.unshift(event.data);
         this.$events.emit('success', trans('components.image_upload_success'));
     },
-
-    selectRevision(revision) {
-        let rev = (this.selectedRevision === revision) ? null : revision;
-        this.selectedRevision = rev;
-    }
 };
 
 const computed = {
@@ -202,7 +191,7 @@ function mounted() {
     baseUrl = window.baseUrl('/images/' + this.imageType + '/all/')
 }
 
-module.exports = {
+export default {
     mounted,
     methods,
     data,