diff --git a/webapp/src/App.vue b/webapp/src/App.vue index b6dcaa26..2bac1622 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -55,8 +55,8 @@ export default { name: "App", components: { - appContent: markRaw(appContent), - loadingContent: markRaw(loadingContent), + appContent, + loadingContent }, data: function () { diff --git a/webapp/src/components/appContent.vue b/webapp/src/components/appContent.vue index c5541476..df186fe9 100644 --- a/webapp/src/components/appContent.vue +++ b/webapp/src/components/appContent.vue @@ -102,9 +102,9 @@ export default { name: "AppContent", components: { - tabIcon: markRaw(tabIcon), - tabContent: markRaw(tabContent), - calibrationWizard: markRaw(calibrationWizard), + tabIcon, + tabContent, + calibrationWizard }, data: function () { return { diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue index 7ace877f..e19e4d8d 100644 --- a/webapp/src/components/labThingsComponents/actionButton.vue +++ b/webapp/src/components/labThingsComponents/actionButton.vue @@ -51,8 +51,8 @@ export default { ], components: { - ActionProgressBar: markRaw(ActionProgressBar), - ActionStatusModal: markRaw(ActionStatusModal) + ActionProgressBar, + ActionStatusModal }, props: { diff --git a/webapp/src/components/labThingsComponents/actionLogDisplay.vue b/webapp/src/components/labThingsComponents/actionLogDisplay.vue index fe8d6110..897bd950 100644 --- a/webapp/src/components/labThingsComponents/actionLogDisplay.vue +++ b/webapp/src/components/labThingsComponents/actionLogDisplay.vue @@ -69,8 +69,7 @@ export default { taskStatus: { handler() { this.scrollToBottom(); - }, - //deep: true, + } }, }, diff --git a/webapp/src/components/labThingsComponents/actionStatusModal.vue b/webapp/src/components/labThingsComponents/actionStatusModal.vue index 1ff79867..90619196 100644 --- a/webapp/src/components/labThingsComponents/actionStatusModal.vue +++ b/webapp/src/components/labThingsComponents/actionStatusModal.vue @@ -35,8 +35,8 @@ import { eventBus } from "../../eventBus.js"; export default { name: "ActionStatusModal", components: { - ActionProgressBar: markRaw(ActionProgressBar), - ActionLogDisplay: markRaw(ActionLogDisplay) + ActionProgressBar, + ActionLogDisplay }, props: { title: { diff --git a/webapp/src/components/labThingsComponents/inputFromSchema.vue b/webapp/src/components/labThingsComponents/inputFromSchema.vue index a19536f2..87bf97c8 100644 --- a/webapp/src/components/labThingsComponents/inputFromSchema.vue +++ b/webapp/src/components/labThingsComponents/inputFromSchema.vue @@ -107,7 +107,7 @@ export default { name: "InputFromSchema", components: { - syncPropertyButton: markRaw(syncPropertyButton), + syncPropertyButton }, props: { diff --git a/webapp/src/components/labThingsComponents/propertyControl.vue b/webapp/src/components/labThingsComponents/propertyControl.vue index b16cd63c..b8b58cb5 100644 --- a/webapp/src/components/labThingsComponents/propertyControl.vue +++ b/webapp/src/components/labThingsComponents/propertyControl.vue @@ -20,7 +20,7 @@ export default { name: "PropertyControl", components: { - InputFromSchema: markRaw(InputFromSchema), + InputFromSchema }, props: { diff --git a/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue b/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue index d62a0e97..143606be 100644 --- a/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue +++ b/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue @@ -25,7 +25,7 @@ export default { name: "ServerSpecifiedActionButton", components: { - ActionButton: markRaw(ActionButton), + ActionButton }, props: { diff --git a/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue b/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue index bdefde74..0b204f9e 100644 --- a/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue +++ b/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue @@ -19,7 +19,7 @@ export default { name: "ServerSpecifiedPropertyControl", components: { - PropertyControl: markRaw(PropertyControl), + PropertyControl }, props: { diff --git a/webapp/src/components/loadingContent.vue b/webapp/src/components/loadingContent.vue index e4a4fa71..5b1d0994 100644 --- a/webapp/src/components/loadingContent.vue +++ b/webapp/src/components/loadingContent.vue @@ -22,7 +22,7 @@ export default { name: "LoadingContent", components: { - devTools: markRaw(devTools) + devTools }, data: function () { diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue index fa01187e..fd16ccad 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue @@ -26,8 +26,8 @@ export default { name: "CameraMainCalibrationStep", components: { - stepTemplateWithStream: markRaw(stepTemplateWithStream), - cameraCalibrationSettings: markRaw(cameraCalibrationSettings), + stepTemplateWithStream, + cameraCalibrationSettings }, computed: { diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue index c4eb8f1a..1b148a39 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue @@ -20,7 +20,7 @@ import { markRaw } from "vue"; export default { name: "CameraCalibrationTask", components: { - calibrationWizardTask: markRaw(calibrationWizardTask) }, + calibrationWizardTask}, props: { // Standard calibrationWizardTask props below: first: Boolean, diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue index 1db10f36..14f30b80 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue @@ -20,8 +20,8 @@ import { markRaw } from "vue"; export default { name: "CameraCalibrationTask", - components: { - calibrationWizardTask: markRaw(calibrationWizardTask) + components: { + calibrationWizardTask }, props: { // Standard calibrationWizardTask props below: diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue index 3d1853bb..b4d183b8 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue @@ -37,8 +37,8 @@ export default { name: "CameraMainCalibrationStep", components: { - stepTemplateWithStream: markRaw(stepTemplateWithStream), - ActionButton: markRaw(ActionButton), + stepTemplateWithStream, + ActionButton }, }; diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue index b699e0fb..5f5db3cb 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue @@ -25,8 +25,8 @@ export default { name: "CameraMainCalibrationStep", components: { - stepTemplateWithStream: markRaw(stepTemplateWithStream), - CSMCalibrationSettings: markRaw(CSMCalibrationSettings), + stepTemplateWithStream, + CSMCalibrationSettings, }, mounted() { diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue index 88dc26f9..b84f37d4 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue @@ -30,7 +30,7 @@ import { markRaw } from "vue"; export default { name: "SingleStepTask", components: { - calibrationWizardTask: markRaw(calibrationWizardTask) + calibrationWizardTask }, props: { // This must be sent diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue index e319bfb2..0b9adc8b 100644 --- a/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue +++ b/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue @@ -15,7 +15,7 @@ export default { name: "StepTemplateWithStream", components: { - miniStreamDisplay: markRaw(miniStreamDisplay), + miniStreamDisplay }, }; diff --git a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue index 67deceb7..f16db7eb 100644 --- a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue +++ b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue @@ -63,7 +63,7 @@ import { markRaw } from "vue"; export default { name: "StatusPane", components: { - ActionButton: markRaw(ActionButton) + ActionButton }, data: function () { diff --git a/webapp/src/components/tabContentComponents/aboutContent.vue b/webapp/src/components/tabContentComponents/aboutContent.vue index a5e508e3..bd07af73 100644 --- a/webapp/src/components/tabContentComponents/aboutContent.vue +++ b/webapp/src/components/tabContentComponents/aboutContent.vue @@ -31,8 +31,8 @@ export default { name: "AboutContent", components: { - devTools: markRaw(devTools), - statusPane: markRaw(statusPane), + devTools, + statusPane }, }; diff --git a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue index ff6a16b4..11d442ad 100644 --- a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue +++ b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue @@ -52,8 +52,8 @@ import { markRaw } from "vue"; export default { components: { - ActionButton: markRaw(ActionButton), - ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl), + ActionButton, + ServerSpecifiedPropertyControl }, data() { diff --git a/webapp/src/components/tabContentComponents/backgroundDetectContent.vue b/webapp/src/components/tabContentComponents/backgroundDetectContent.vue index 408d268c..d15bc1c6 100644 --- a/webapp/src/components/tabContentComponents/backgroundDetectContent.vue +++ b/webapp/src/components/tabContentComponents/backgroundDetectContent.vue @@ -20,8 +20,8 @@ export default { name: "BackgroundDetectContent", components: { - paneBackgroundDetect: markRaw(paneBackgroundDetect), - streamDisplay: markRaw(streamDisplay), + paneBackgroundDetect, + streamDisplay }, }; diff --git a/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue b/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue index 4ccfd894..eebfd0d3 100644 --- a/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue +++ b/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue @@ -26,7 +26,7 @@ export default { name: "AutofocusControl", components: { - ActionButton: markRaw(ActionButton), + ActionButton }, data: function () { diff --git a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue index 92b4e24b..269984e3 100644 --- a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue +++ b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue @@ -41,9 +41,9 @@ export default { name: "PaneControl", components: { - ActionButton: markRaw(ActionButton), - positionControl: markRaw(positionControl), - autofocusControl: markRaw(autofocusControl), + ActionButton, + positionControl, + autofocusControl }, computed: { diff --git a/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue b/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue index 457dab10..e1cd507c 100644 --- a/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue +++ b/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue @@ -69,9 +69,9 @@ export default { name: "PaneControl", components: { - ActionButton: markRaw(ActionButton), - syncPropertyButton: markRaw(syncPropertyButton), - stageControlButtons: markRaw(stageControlButtons), + ActionButton, + syncPropertyButton, + stageControlButtons }, data: function () { diff --git a/webapp/src/components/tabContentComponents/controlContent.vue b/webapp/src/components/tabContentComponents/controlContent.vue index 98b44a8e..1226e205 100644 --- a/webapp/src/components/tabContentComponents/controlContent.vue +++ b/webapp/src/components/tabContentComponents/controlContent.vue @@ -20,8 +20,8 @@ export default { name: "ControlContent", components: { - paneControl: markRaw(paneControl), - streamDisplay: markRaw(streamDisplay) , + paneControl, + streamDisplay }, }; diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index 46abef0c..626cc723 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -90,8 +90,8 @@ export default { name: "LoggingContent", components: { - Paginate: markRaw(Paginate), - EndpointButton: markRaw(EndpointButton), + Paginate, + EndpointButton }, data: function () { diff --git a/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue b/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue index d0fd46ac..98d228d1 100644 --- a/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue +++ b/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue @@ -89,8 +89,8 @@ import { markRaw } from "vue"; export default { name: "ScanCard", components: { - actionButton: markRaw(actionButton), - EndpointButton: markRaw(EndpointButton) + actionButton, + EndpointButton }, props: { diff --git a/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue b/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue index b589c9fc..e86bd766 100644 --- a/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue +++ b/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue @@ -61,7 +61,7 @@ import { markRaw } from "vue"; export default { name: "ScanViewerModal", components: { - OpenSeadragonViewer: markRaw(OpenSeadragonViewer) + OpenSeadragonViewer }, props: { selectedScan: { diff --git a/webapp/src/components/tabContentComponents/scanListContent.vue b/webapp/src/components/tabContentComponents/scanListContent.vue index d5e532b8..0515aaf8 100644 --- a/webapp/src/components/tabContentComponents/scanListContent.vue +++ b/webapp/src/components/tabContentComponents/scanListContent.vue @@ -108,9 +108,9 @@ import { eventBus } from "../../eventBus.js"; export default { name: "ScanListContent", components: { - actionButton: markRaw(actionButton), - scanCard: markRaw(scanCard), - ScanViewerModal: markRaw(ScanViewerModal) + actionButton, + scanCard, + ScanViewerModal }, data: function () { diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue index ca01dc8e..3f21e026 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue @@ -25,8 +25,8 @@ export default { name: "CSMSettings", components: { - CSMCalibrationSettings: markRaw(CSMCalibrationSettings), - miniStreamDisplay: markRaw(miniStreamDisplay), + CSMCalibrationSettings, + miniStreamDisplay }, }; diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue index 1366f3a5..d6f0e648 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue @@ -65,8 +65,8 @@ export default { name: "CSMCalibrationSettings", components: { - ActionButton: markRaw(ActionButton), - matrixDisplay: markRaw(matrixDisplay), + ActionButton, + matrixDisplay }, props: { diff --git a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue index 4ba6058c..054fc139 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue @@ -33,9 +33,9 @@ export default { name: "CameraSettings", components: { - cameraCalibrationSettings: markRaw(cameraCalibrationSettings), - miniStreamDisplay: markRaw(miniStreamDisplay), - ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl), + cameraCalibrationSettings, + miniStreamDisplay, + ServerSpecifiedPropertyControl }, data() { diff --git a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue index 017c2953..32848411 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue @@ -30,7 +30,7 @@ export default { name: "CameraCalibrationSettings", components: { - ServerSpecifiedActionButton: markRaw(ServerSpecifiedActionButton), + ServerSpecifiedActionButton, }, props: { diff --git a/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue index 6bfbc3a9..f9dc6654 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue @@ -15,8 +15,8 @@ export default { name: "DisplaySettings", components: { - streamSettings: markRaw(streamSettings), - appSettings: markRaw(appSettings), + streamSettings, + appSettings }, }; diff --git a/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue index 3350e5f1..59ede7e1 100644 --- a/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue +++ b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue @@ -36,7 +36,7 @@ export default { name: "StageSettings", components: { - ActionButton: markRaw(ActionButton), + ActionButton }, data: function () { diff --git a/webapp/src/components/tabContentComponents/settingsContent.vue b/webapp/src/components/tabContentComponents/settingsContent.vue index 35377c99..656b3dbe 100644 --- a/webapp/src/components/tabContentComponents/settingsContent.vue +++ b/webapp/src/components/tabContentComponents/settingsContent.vue @@ -76,9 +76,9 @@ export default { name: "SettingsContent", components: { - tabIcon: markRaw(tabIcon), - tabContent: markRaw(tabContent), - calibrationWizard: markRaw(calibrationWizard), + tabIcon, + tabContent, + calibrationWizard }, data: function () { diff --git a/webapp/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue index beba5c72..441a92a3 100644 --- a/webapp/src/components/tabContentComponents/slideScanContent.vue +++ b/webapp/src/components/tabContentComponents/slideScanContent.vue @@ -160,12 +160,12 @@ export default { name: "SlideScanContent", components: { - streamDisplay: markRaw(streamDisplay), - propertyControl: markRaw(propertyControl), - actionLogDisplay: markRaw(actionLogDisplay), - actionProgressBar: markRaw(actionProgressBar), - MiniStreamDisplay: markRaw(MiniStreamDisplay), - ActionButton: markRaw(ActionButton), + streamDisplay, + propertyControl, + actionLogDisplay, + actionProgressBar, + MiniStreamDisplay, + ActionButton, }, data() { diff --git a/webapp/src/components/tabContentComponents/viewContent.vue b/webapp/src/components/tabContentComponents/viewContent.vue index d4038b3a..b3f5380f 100644 --- a/webapp/src/components/tabContentComponents/viewContent.vue +++ b/webapp/src/components/tabContentComponents/viewContent.vue @@ -16,7 +16,7 @@ export default { name: "ViewContent", components: { - streamDisplay: markRaw(streamDisplay), + streamDisplay, }, };