Compare commits

...

6 Commits

Author SHA1 Message Date
0e4685bff3 reduce code 2021-06-15 15:57:03 -07:00
7a928989ab revert b919cf9 to be fixed properly 2021-06-15 14:51:51 -07:00
b919cf9f69 add mmgis (external plugin) type to style exclusion list 2021-06-15 14:08:40 -07:00
4b191c5e39 check if there is an element to style 2021-06-15 10:35:09 -07:00
6483fe2402 Prepare master for Sprint 1.7.4 (#3925) 2021-06-07 11:37:49 -07:00
a123889d6a Pre release for Sprint 1.7.3 (#3924)
* Revert "upgrade to webpack5 (#3871)" (#3907) (#3908)
* [Navigation Tree] Fix composition on closed folders and scrolling for items NOT in tree (#3920)
* Update package.json version and version documentation to include tags for npmjs

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
2021-06-07 11:25:58 -07:00
5 changed files with 31 additions and 15 deletions

View File

@ -131,7 +131,8 @@ numbers by the following process:
3. In `package.json` change package to be public (private: false)
4. Test the package before publishing by doing `npm publish --dry-run`
if necessary.
5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
5. Publish the package to the npmjs registry (e.g. `npm publish --access public`)
NOTE: Use the `--tag unstable` flag to the npm publishj if this is a prerelease.
6. Confirm the package has been published (e.g. `https://www.npmjs.com/package/openmct`)
5. Update snapshot status in `package.json`
1. Create a new branch off the `master` branch.

View File

@ -1,6 +1,6 @@
{
"name": "openmct",
"version": "1.7.3-SNAPSHOT",
"version": "1.7.4-SNAPSHOT",
"description": "The Open MCT core platform",
"dependencies": {},
"devDependencies": {

View File

@ -579,7 +579,7 @@ define([
*/
TelemetryAPI.prototype.getLimits = function (domainObject) {
const provider = this.findLimitEvaluator(domainObject);
if (!provider) {
if (!provider || !provider.getLimits) {
return {
limits: function () {}
};

View File

@ -118,10 +118,11 @@ export default {
this.openmct.objectViews.off('clearData', this.clearData);
},
getStyleReceiver() {
let styleReceiver = this.$el.querySelector('.js-style-receiver');
let styleReceiver = this.$el.querySelector('.js-style-receiver')
|| this.$el.querySelector(':first-child');
if (!styleReceiver) {
styleReceiver = this.$el.querySelector(':first-child');
if (styleReceiver === null) {
styleReceiver = undefined;
}
return styleReceiver;
@ -142,12 +143,13 @@ export default {
this.updateView(true);
},
updateStyle(styleObj) {
if (!styleObj) {
let elemToStyle = this.getStyleReceiver();
if (!styleObj || elemToStyle === undefined) {
return;
}
let keys = Object.keys(styleObj);
let elemToStyle = this.getStyleReceiver();
keys.forEach(key => {
if (elemToStyle) {
@ -373,11 +375,17 @@ export default {
},
setFontSize(newSize) {
let elemToStyle = this.getStyleReceiver();
elemToStyle.dataset.fontSize = newSize;
if (elemToStyle !== undefined) {
elemToStyle.dataset.fontSize = newSize;
}
},
setFont(newFont) {
let elemToStyle = this.getStyleReceiver();
elemToStyle.dataset.font = newFont;
if (elemToStyle !== undefined) {
elemToStyle.dataset.font = newFont;
}
}
}
};

View File

@ -308,6 +308,7 @@ export default {
|| !checkItem.navigationPath.includes(path);
});
this.openTreeItems.splice(pathIndex, 1);
this.removeCompositionListenerFor(path);
},
closeTreeItem(item) {
this.closeTreeItemByPath(item.navigationPath);
@ -393,12 +394,18 @@ export default {
}
const indexOfScroll = this.treeItems.findIndex(item => item.navigationPath === navigationPath);
const scrollTopAmount = indexOfScroll * this.itemHeight;
this.$refs.scrollable.scrollTo({
top: scrollTopAmount,
behavior: 'smooth'
});
if (indexOfScroll !== -1) {
const scrollTopAmount = indexOfScroll * this.itemHeight;
this.$refs.scrollable.scrollTo({
top: scrollTopAmount,
behavior: 'smooth'
});
} else if (this.scrollToPath) {
this.scrollToPath = undefined;
delete this.scrollToPath;
}
},
scrollEndEvent() {
this.$nextTick(() => {