ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 09:26:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

backwards compatible fix and switching between multi to single root children fix (#3319)

Browse Source
This commit is contained in:
Jamie V 2020-08-24 15:00:11 -07:00 committed by GitHub
parent 4801dc4f32
commit 278f48f65c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/objects/RootObjectProvider.js
View File

@ -34,7 +34,7 @@ class RootObjectProvider {
composition: []
};
RootObjectProvider.instance = this;
} else {
} else if (rootRegistry) {
// if called twice, update instance rootRegistry
RootObjectProvider.instance.rootRegistry = rootRegistry;
}

6
src/ui/layout/mct-tree.vue
View File

@ -451,6 +451,12 @@ export default {
this.jumpPath = this.jumpPath[0];
}
// switching back and forth between multiple root children can cause issues,
// this checks for one of those issues
if (this.jumpPath.key) {
this.jumpPath = this.jumpPath.key;
}
let nodes = this.jumpPath.split('/');
for (let i = 0; i < nodes.length; i++) {