From b7efd3b74d71e8654014ebd25714fdb31c87b7de Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Wed, 22 Sep 2021 16:09:54 -0700 Subject: [PATCH] Renamed some files and variables to fix some JS errors --- app/resources/js/app.js | 6 +++--- .../js/components/{application.js => Application.js} | 0 .../js/components/{file-info-modal.js => FileInfoModal.js} | 6 +++--- app/views/components/file-info-modal.twig | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename app/resources/js/components/{application.js => Application.js} (100%) rename app/resources/js/components/{file-info-modal.js => FileInfoModal.js} (87%) diff --git a/app/resources/js/app.js b/app/resources/js/app.js index eee7ccd..24c535c 100644 --- a/app/resources/js/app.js +++ b/app/resources/js/app.js @@ -2,11 +2,11 @@ import Alpine from 'alpinejs'; import hljs from 'highlight.js'; // Alpine.js components -import Application from './components/application.js'; -import FileInfoModal from './components/file-info-modal.js'; +import Application from './components/Application.js'; +import FileInfoModal from './components/FileInfoModal.js'; Alpine.data('application', Application); -Alpine.data('file-info-modal', FileInfoModal); +Alpine.data('fileInfoModal', FileInfoModal); // Run Alpine.js Alpine.start(); diff --git a/app/resources/js/components/application.js b/app/resources/js/components/Application.js similarity index 100% rename from app/resources/js/components/application.js rename to app/resources/js/components/Application.js diff --git a/app/resources/js/components/file-info-modal.js b/app/resources/js/components/FileInfoModal.js similarity index 87% rename from app/resources/js/components/file-info-modal.js rename to app/resources/js/components/FileInfoModal.js index cad72ac..ca5a23c 100644 --- a/app/resources/js/components/file-info-modal.js +++ b/app/resources/js/components/FileInfoModal.js @@ -3,7 +3,7 @@ import axios from 'axios'; export default () => ({ error: null, filePath: 'file.info', - hashes: null, + hashes: {}, visible: false, get title() { @@ -11,7 +11,7 @@ export default () => ({ }, get loading() { - return this.hashes === null; + return Object.keys(this.hashes).length === 0; }, async show(filePath) { @@ -30,7 +30,7 @@ export default () => ({ hide() { this.visible = false; - this.hashes = null; + this.hashes = {}; this.error = null; } }); diff --git a/app/views/components/file-info-modal.twig b/app/views/components/file-info-modal.twig index 3d58d02..2d7b204 100644 --- a/app/views/components/file-info-modal.twig +++ b/app/views/components/file-info-modal.twig @@ -1,5 +1,5 @@