From ef023675cec28e5a3ec4443c3abfdf82bf0eaa24 Mon Sep 17 00:00:00 2001 From: Buster Neece Date: Thu, 29 Dec 2022 13:31:23 -0600 Subject: [PATCH] Prefix template refs to avoid name conflicts. --- frontend/vue/components/Account.vue | 30 ++++----- .../vue/components/Account/ApiKeyModal.vue | 9 +-- .../Account/ChangePasswordModal.vue | 10 +-- frontend/vue/components/Account/EditModal.vue | 9 ++- .../vue/components/Account/TwoFactorModal.vue | 8 +-- frontend/vue/components/Admin/ApiKeys.vue | 6 +- frontend/vue/components/Admin/AuditLog.vue | 6 +- frontend/vue/components/Admin/Backups.vue | 24 +++---- .../Admin/Backups/ConfigureModal.vue | 8 +-- .../Admin/Backups/LastOutputModal.vue | 6 +- .../Admin/Backups/RunBackupModal.vue | 8 +-- .../vue/components/Admin/CustomFields.vue | 18 +++--- .../Admin/Index/CpuStatsHelpModal.vue | 9 ++- .../Admin/Index/MemoryStatsHelpModal.vue | 8 +-- frontend/vue/components/Admin/Logs.vue | 6 +- .../components/Admin/Settings/ServicesTab.vue | 6 +- .../Admin/Settings/TestMessageModal.vue | 6 +- .../components/Admin/Stations/CloneModal.vue | 8 +-- .../components/Admin/Stations/EditModal.vue | 18 +++--- .../components/Common/Charts/HourChart.vue | 6 +- .../vue/components/Common/Charts/PieChart.vue | 6 +- .../Common/Charts/TimeSeriesChart.vue | 6 +- frontend/vue/components/Common/FlowUpload.vue | 62 +++++++++---------- .../components/Common/StreamingLogModal.vue | 14 ++--- .../vue/components/Form/BWrappedFormGroup.vue | 8 +-- frontend/vue/components/InlinePlayer.vue | 12 ++-- .../Public/FullPlayer/RequestModal.vue | 6 +- frontend/vue/components/Public/Player.vue | 6 +- frontend/vue/components/Setup/Station.vue | 6 +- frontend/vue/components/Stations/Help.vue | 6 +- .../vue/components/Stations/HlsStreams.vue | 14 ++--- .../components/Stations/LiquidsoapConfig.vue | 2 +- .../components/Stations/Media/EditModal.vue | 8 +-- .../Stations/Media/Form/WaveformEditor.vue | 34 +++++----- frontend/vue/components/Stations/Mounts.vue | 14 ++--- .../Stations/Profile/EmbedModal.vue | 6 +- .../Stations/Profile/PublicPagesPanel.vue | 6 +- .../vue/components/Stations/ProfileEdit.vue | 6 +- .../components/Stations/Queue/LogsModal.vue | 8 +-- frontend/vue/components/Stations/Remotes.vue | 14 ++--- .../Stations/Reports/Listeners/InnerMap.vue | 6 +- .../Stations/Reports/Listeners/MapPoint.vue | 6 +- 42 files changed, 232 insertions(+), 233 deletions(-) diff --git a/frontend/vue/components/Account.vue b/frontend/vue/components/Account.vue index 308206d1e..7bf4da736 100644 --- a/frontend/vue/components/Account.vue +++ b/frontend/vue/components/Account.vue @@ -100,7 +100,7 @@ - @@ -185,7 +185,7 @@ const apiKeyFields = [ } ]; -const datatable = ref(); // DataTable +const $dataTable = ref(); // DataTable const {wrapWithLoading, notifySuccess} = useNotify(); const {axios} = useAxios(); @@ -217,7 +217,7 @@ const relist = () => { securityLoading.value = false; }); - datatable.value?.relist(); + $dataTable.value?.relist(); }; onMounted(relist); @@ -226,22 +226,22 @@ const reload = () => { location.reload(); }; -const editmodal = ref(); // EditModal +const $editModal = ref(); // EditModal const doEditProfile = () => { - editmodal.value?.open(); + $editModal.value?.open(); }; -const changepasswordmodal = ref(); // ChangePasswordModal +const $changePasswordModal = ref(); // ChangePasswordModal const doChangePassword = () => { - changepasswordmodal.value?.open(); + $changePasswordModal.value?.open(); }; -const twofactormodal = ref(); // TwoFactorModal +const $twoFactorModal = ref(); // TwoFactorModal const enableTwoFactor = () => { - twofactormodal.value?.open(); + $twoFactorModal.value?.open(); }; const {confirmDelete} = useSweetAlert(); @@ -261,10 +261,10 @@ const disableTwoFactor = () => { }); }; -const apikeymodal = ref(); // ApiKeyModal +const $apiKeyModal = ref(); // ApiKeyModal const createApiKey = () => { - apikeymodal.value?.create(); + $apiKeyModal.value?.create(); }; const deleteApiKey = (url) => { diff --git a/frontend/vue/components/Account/ApiKeyModal.vue b/frontend/vue/components/Account/ApiKeyModal.vue index 1652626a2..2d83ae18b 100644 --- a/frontend/vue/components/Account/ApiKeyModal.vue +++ b/frontend/vue/components/Account/ApiKeyModal.vue @@ -1,5 +1,6 @@