diff --git a/src/plugins/LADTable/LADTableSetViewProvider.js b/src/plugins/LADTable/LADTableSetViewProvider.js index 9b0210e3c5..478b59660d 100644 --- a/src/plugins/LADTable/LADTableSetViewProvider.js +++ b/src/plugins/LADTable/LADTableSetViewProvider.js @@ -38,7 +38,7 @@ define([ canEdit: function (domainObject) { return domainObject.type === 'LadTableSet'; }, - view: function (domainObject, isEditing, objectPath) { + view: function (domainObject, objectPath) { let component; return { diff --git a/src/plugins/LADTable/LADTableViewProvider.js b/src/plugins/LADTable/LADTableViewProvider.js index 7fe5fc4dee..299ae3b035 100644 --- a/src/plugins/LADTable/LADTableViewProvider.js +++ b/src/plugins/LADTable/LADTableViewProvider.js @@ -38,7 +38,7 @@ define([ canEdit: function (domainObject) { return domainObject.type === 'LadTable'; }, - view: function (domainObject, isEditing, objectPath) { + view: function (domainObject, objectPath) { let component; return { diff --git a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js index 49a651b064..4848d55f54 100644 --- a/src/plugins/displayLayout/AlphanumericFormatViewProvider.js +++ b/src/plugins/displayLayout/AlphanumericFormatViewProvider.js @@ -46,7 +46,7 @@ define([ return selection.every(isTelemetryObject); }, - view: function (domainObject, isEditing, objectPath) { + view: function (domainObject, objectPath) { let component; return { show: function (element) { diff --git a/src/plugins/displayLayout/plugin.js b/src/plugins/displayLayout/plugin.js index 250d128f09..7f1c9a79ca 100644 --- a/src/plugins/displayLayout/plugin.js +++ b/src/plugins/displayLayout/plugin.js @@ -37,7 +37,7 @@ export default function DisplayLayoutPlugin(options) { canEdit: function (domainObject) { return domainObject.type === 'layout'; }, - view: function (domainObject, isEditing, objectPath) { + view: function (domainObject, objectPath) { let component; return { show(container) { diff --git a/src/plugins/telemetryTable/TelemetryTableViewProvider.js b/src/plugins/telemetryTable/TelemetryTableViewProvider.js index f6719b5784..a85a863691 100644 --- a/src/plugins/telemetryTable/TelemetryTableViewProvider.js +++ b/src/plugins/telemetryTable/TelemetryTableViewProvider.js @@ -48,7 +48,7 @@ define([ canEdit(domainObject) { return domainObject.type === 'table'; }, - view(domainObject, isEditing, objectPath) { + view(domainObject, objectPath) { let table = new TelemetryTable(domainObject, openmct); let component; return { diff --git a/src/ui/components/ObjectView.vue b/src/ui/components/ObjectView.vue index afbbd56c5c..6f306b2941 100644 --- a/src/ui/components/ObjectView.vue +++ b/src/ui/components/ObjectView.vue @@ -77,7 +77,7 @@ export default { if (!this.currentObject) { return; } - + this.composition = this.openmct.composition.get(this.currentObject); if (this.composition) { this.composition._synchronize(); @@ -98,13 +98,13 @@ export default { if (this.openmct.editor.isEditing()) { this.currentView = provider.edit(this.currentObject, true, objectPath); } else { - this.currentView = provider.view(this.currentObject, false, objectPath); + this.currentView = provider.view(this.currentObject, objectPath); } this.openmct.editor.on('isEditing', this.toggleEditView); this.releaseEditModeHandler = () => this.openmct.editor.off('isEditing', this.toggleEditView); } else { - this.currentView = provider.view(this.currentObject, this.openmct.editor.isEditing(), objectPath); + this.currentView = provider.view(this.currentObject, objectPath); if (this.currentView.onEditModeChange) { this.openmct.editor.on('isEditing', this.invokeEditModeHandler); @@ -186,7 +186,7 @@ export default { }, editIfEditable(event) { let provider = this.getViewProvider(); - if (provider && + if (provider && provider.canEdit && provider.canEdit(this.currentObject) && !this.openmct.editor.isEditing()) { @@ -204,7 +204,7 @@ export default { if (domainObject) { let clearKeyString = this.openmct.objects.makeKeyString(domainObject.identifier), currentObjectKeyString = this.openmct.objects.makeKeyString(this.currentObject.identifier); - + if (clearKeyString === currentObjectKeyString) { if (this.currentView.onClearData) { this.currentView.onClearData(); diff --git a/src/ui/preview/Preview.vue b/src/ui/preview/Preview.vue index cdc99b3684..5c31541e38 100644 --- a/src/ui/preview/Preview.vue +++ b/src/ui/preview/Preview.vue @@ -39,8 +39,8 @@ @setView="setView"> @@ -123,13 +123,13 @@ }, setView(view) { this.clear(); - + this.viewKey = view.key; this.viewContainer = document.createElement('div'); this.viewContainer.classList.add('c-object-view','u-contents'); this.$refs.objectView.append(this.viewContainer); - this.view = this.currentView.view(this.domainObject, false, this.objectPath); + this.view = this.currentView.view(this.domainObject, this.objectPath); this.view.show(this.viewContainer, false); } }, diff --git a/src/ui/registries/ViewRegistry.js b/src/ui/registries/ViewRegistry.js index ed8b3e3f0c..ea8a7a444b 100644 --- a/src/ui/registries/ViewRegistry.js +++ b/src/ui/registries/ViewRegistry.js @@ -225,7 +225,6 @@ define(['EventEmitter'], function (EventEmitter) { * * When called by Open MCT, the following arguments will be passed to it: * @param {object} domainObject - the domainObject that the view is provided for - * @param {boolean} isEditing - A boolean value indicating wether openmct is in a global edit mode * @param {array} objectPath - The current contextual object path of the view object * eg current domainObject is located under MyItems which is under Root *