Compare commits

...

4 Commits

Author SHA1 Message Date
412eaf599e Update version 2021-06-28 09:18:56 -07:00
0691a35dab Disallow pause and play in time strip view for plots. (#3972)
- Disallow pause and play in time strip view for plots.
2021-06-24 15:43:47 -07:00
f57191fd89 Fix navigation errors (#3970)
* Only add listeners to observables on creation
* Do not double destroy mutable objects
2021-06-24 10:26:11 -07:00
14066b5c4d catching any errors from a user canceling from dialog (#3968) 2021-06-23 14:37:30 -07:00
5 changed files with 31 additions and 38 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "openmct", "name": "openmct",
"version": "1.7.4-SNAPSHOT", "version": "1.7.4",
"description": "The Open MCT core platform", "description": "The Open MCT core platform",
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
@ -102,5 +102,5 @@
}, },
"author": "", "author": "",
"license": "Apache-2.0", "license": "Apache-2.0",
"private": true "private": false
} }

View File

@ -399,7 +399,6 @@ ObjectAPI.prototype._toMutable = function (object) {
mutableObject = object; mutableObject = object;
} else { } else {
mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter); mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter);
}
// Check if provider supports realtime updates // Check if provider supports realtime updates
let identifier = utils.parseKeyString(mutableObject.identifier); let identifier = utils.parseKeyString(mutableObject.identifier);
@ -419,6 +418,7 @@ ObjectAPI.prototype._toMutable = function (object) {
unobserve(); unobserve();
}); });
} }
}
return mutableObject; return mutableObject;
}; };

View File

@ -37,7 +37,15 @@ export default class DuplicateAction {
let duplicationTask = new DuplicateTask(this.openmct); let duplicationTask = new DuplicateTask(this.openmct);
let originalObject = objectPath[0]; let originalObject = objectPath[0];
let parent = objectPath[1]; let parent = objectPath[1];
let userInput = await this.getUserInput(originalObject, parent); let userInput;
try {
userInput = await this.getUserInput(originalObject, parent);
} catch (error) {
// user most likely canceled
return;
}
let newParent = userInput.location; let newParent = userInput.location;
let inNavigationPath = this.inNavigationPath(originalObject); let inNavigationPath = this.inNavigationPath(originalObject);

View File

@ -102,7 +102,7 @@
> >
</button> </button>
</div> </div>
<div v-if="isRealTime" <div v-if="isRealTime && !options.compact"
class="c-button-set c-button-set--strip-h js-pause" class="c-button-set c-button-set--strip-h js-pause"
> >
<button v-if="!isFrozen" <button v-if="!isFrozen"

View File

@ -10,7 +10,6 @@ define([
let unobserve = undefined; let unobserve = undefined;
let currentObjectPath; let currentObjectPath;
let isRoutingInProgress = false; let isRoutingInProgress = false;
let mutable;
openmct.router.route(/^\/browse\/?$/, navigateToFirstChildOfRoot); openmct.router.route(/^\/browse\/?$/, navigateToFirstChildOfRoot);
openmct.router.route(/^\/browse\/(.*)$/, (path, results, params) => { openmct.router.route(/^\/browse\/(.*)$/, (path, results, params) => {
@ -37,24 +36,10 @@ define([
} }
function viewObject(object, viewProvider) { function viewObject(object, viewProvider) {
if (mutable) {
openmct.objects.destroyMutable(mutable);
mutable = undefined;
}
if (openmct.objects.supportsMutation(object.identifier)) {
mutable = openmct.objects._toMutable(object);
}
currentObjectPath = openmct.router.path; currentObjectPath = openmct.router.path;
if (mutable !== undefined) {
openmct.layout.$refs.browseObject.show(mutable, viewProvider.key, true, currentObjectPath);
openmct.layout.$refs.browseBar.domainObject = mutable;
} else {
openmct.layout.$refs.browseObject.show(object, viewProvider.key, true, currentObjectPath); openmct.layout.$refs.browseObject.show(object, viewProvider.key, true, currentObjectPath);
openmct.layout.$refs.browseBar.domainObject = object; openmct.layout.$refs.browseBar.domainObject = object;
}
openmct.layout.$refs.browseBar.viewKey = viewProvider.key; openmct.layout.$refs.browseBar.viewKey = viewProvider.key;
} }