Compare commits

...

6 Commits

Author SHA1 Message Date
Joshi
6d7697e366 Set version to 1.6.2 2021-03-17 10:26:13 -07:00
Joshi
ffbab225e6 Merge branch 'master' of https://github.com/nasa/openmct into version-1.6.2 2021-03-17 10:25:45 -07:00
Jamie V
b042d9098d doing correct comparison to find page to delete (#3754) 2021-03-12 15:49:58 -08:00
Shefali Joshi
325f2c4860 Pinch to zoom and wheel zoom work the same way (#3752) 2021-03-12 12:22:22 -08:00
Jamie V
74a516aa9e [Date Picker] Highlight Selected Date (#3678)
* WIP: added color, was not sure correct sass variable, charles... take it from here!

* adding charles name to the comment for posterity

Co-authored-by: Deep Tailor <deep.j.tailor@nasa.gov>
2021-03-11 10:25:30 -08:00
Shefali Joshi
28e26461cc Change master to 1.6.3 SNAPSHOT (#3749) 2021-03-10 10:40:30 -08:00
4 changed files with 23 additions and 4 deletions

View File

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

View File

@@ -69,7 +69,7 @@ export default {
methods: {
deletePage(id) {
const selectedSection = this.sections.find(s => s.isSelected);
const page = this.pages.find(p => p.id !== id);
const page = this.pages.find(p => p.id === id);
deleteNotebookEntries(this.openmct, this.domainObject, selectedSection, page);
const selectedPage = this.pages.find(p => p.isSelected);

View File

@@ -413,6 +413,21 @@ define([
return;
}
const isPinchToZoom = event.ctrlKey === true;
let isZoomIn = event.wheelDelta < 0;
let isZoomOut = event.wheelDelta >= 0;
//Flip the zoom direction if this is pinch to zoom
if (isPinchToZoom) {
if (isZoomIn === true) {
isZoomOut = true;
isZoomIn = false;
} else if (isZoomOut === true) {
isZoomIn = true;
isZoomOut = false;
}
}
let xDisplayRange = this.$scope.xAxis.get('displayRange');
let yDisplayRange = this.$scope.yAxis.get('displayRange');
@@ -445,7 +460,7 @@ define([
};
}
if (event.wheelDelta < 0) {
if (isZoomIn) {
this.$scope.xAxis.set('displayRange', {
min: xDisplayRange.min + ((xAxisDist * ZOOM_AMT) * xAxisMinDist),
@@ -456,7 +471,7 @@ define([
min: yDisplayRange.min + ((yAxisDist * ZOOM_AMT) * yAxisMinDist),
max: yDisplayRange.max - ((yAxisDist * ZOOM_AMT) * yAxisMaxDist)
});
} else if (event.wheelDelta >= 0) {
} else if (isZoomOut) {
this.$scope.xAxis.set('displayRange', {
min: xDisplayRange.min - ((xAxisDist * ZOOM_AMT) * xAxisMinDist),

View File

@@ -67,6 +67,10 @@
&.is-in-month {
background: $colorMenuElementHilite;
}
&.selected {
background: #1ac6ff; // this should be a variable... CHARLESSSSSS
}
}
&__day {