Removed parallel testing, updated predis

[bookstack] / resources / js / components / image-manager.js

diff --git a/resources/js/components/image-manager.js b/resources/js/components/image-manager.js
index c974ab1b0abd818d7be81c81d08ae56cf134cd6c..418b7c98a2be0f16801f7b0ac7e45536c6ff8faa 100644 (file)
--- a/resources/js/components/image-manager.js
+++ b/resources/js/components/image-manager.js
@@ -1,13 +1,9 @@
 import {onChildEvent, onSelect, removeLoading, showLoading} from "../services/dom";
 import {onChildEvent, onSelect, removeLoading, showLoading} from "../services/dom";

+import {Component} from "./component";

 
 

-/**
- * ImageManager
- * @extends {Component}
- */
-class ImageManager {
+export class ImageManager extends Component {

 
     setup() {
 
     setup() {

-

         // Options
         this.uploadedTo = this.$opts.uploadedTo;
 
         // Options
         this.uploadedTo = this.$opts.uploadedTo;
 


@@ -36,8 +32,6 @@ class ImageManager {
         this.resetState();
 
         this.setupListeners();
         this.resetState();
 
         this.setupListeners();

-
-        window.ImageManager = this;

     }
 
     setupListeners() {
     }
 
     setupListeners() {


@@ -74,6 +68,10 @@ class ImageManager {
 
         this.listContainer.addEventListener('event-emit-select-image', this.onImageSelectEvent.bind(this));
 
 
         this.listContainer.addEventListener('event-emit-select-image', this.onImageSelectEvent.bind(this));
 

+        this.listContainer.addEventListener('error', event => {
+            event.target.src = baseUrl('loading_error.png');
+        }, true);
+

         onSelect(this.selectButton, () => {
             if (this.callback) {
                 this.callback(this.lastSelected);
         onSelect(this.selectButton, () => {
             if (this.callback) {
                 this.callback(this.lastSelected);


@@ -96,7 +94,7 @@ class ImageManager {
 
         this.callback = callback;
         this.type = type;
 
         this.callback = callback;
         this.type = type;

-        this.popupEl.components.popup.show();
+        this.getPopup().show();

         this.dropzoneContainer.classList.toggle('hidden', type !== 'gallery');
 
         if (!this.hasData) {
         this.dropzoneContainer.classList.toggle('hidden', type !== 'gallery');
 
         if (!this.hasData) {


@@ -106,7 +104,14 @@ class ImageManager {
     }
 
     hide() {
     }
 
     hide() {

-        this.popupEl.components.popup.hide();
+        this.getPopup().hide();
+    }
+
+    /**
+     * @returns {Popup}
+     */
+    getPopup() {
+        return window.$components.firstOnElement(this.popupEl, 'popup');

     }
 
     async loadGallery() {
     }
 
     async loadGallery() {


@@ -118,6 +123,9 @@ class ImageManager {
         };
 
         const {data: html} = await window.$http.get(`images/${this.type}`, params);
         };
 
         const {data: html} = await window.$http.get(`images/${this.type}`, params);

+        if (params.page === 1) {
+            this.listContainer.innerHTML = '';
+        }

         this.addReturnedHtmlElementsToList(html);
         removeLoading(this.listContainer);
     }
         this.addReturnedHtmlElementsToList(html);
         removeLoading(this.listContainer);
     }


@@ -125,17 +133,16 @@ class ImageManager {
     addReturnedHtmlElementsToList(html) {
         const el = document.createElement('div');
         el.innerHTML = html;
     addReturnedHtmlElementsToList(html) {
         const el = document.createElement('div');
         el.innerHTML = html;

-        window.components.init(el);
+        window.$components.init(el);

         for (const child of [...el.children]) {
             this.listContainer.appendChild(child);
         }
     }
 
     setActiveFilterTab(filterName) {
         for (const child of [...el.children]) {
             this.listContainer.appendChild(child);
         }
     }
 
     setActiveFilterTab(filterName) {

-        this.filterTabs.forEach(t => t.classList.remove('selected'));
-        const activeTab = this.filterTabs.find(t => t.dataset.filter === filterName);
-        if (activeTab) {
-            activeTab.classList.add('selected');
+        for (const tab of this.filterTabs) {
+            const selected = tab.dataset.filter === filterName;
+            tab.setAttribute('aria-selected', selected ? 'true' : 'false');

         }
     }
 
         }
     }
 


@@ -200,9 +207,7 @@ class ImageManager {
         const params = requestDelete ? {delete: true} : {};
         const {data: formHtml} = await window.$http.get(`/images/edit/${imageId}`, params);
         this.formContainer.innerHTML = formHtml;
         const params = requestDelete ? {delete: true} : {};
         const {data: formHtml} = await window.$http.get(`/images/edit/${imageId}`, params);
         this.formContainer.innerHTML = formHtml;

-        window.components.init(this.formContainer);
+        window.$components.init(this.formContainer);

     }
 
     }
 

-}
-
-export default ImageManager;
\ No newline at end of file
+}
\ No newline at end of file