Skip to content

Commit

Permalink
Revert "expanded legend showing, but malformed"
Browse files Browse the repository at this point in the history
This reverts commit b954f00.
  • Loading branch information
scottbell committed Feb 1, 2024
1 parent b954f00 commit 135e714
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
"WCAG",
"stackedplot",
"Andale",
"unnormalized",
"unnnormalized",
"checksnapshots",
"specced",
"countup"
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/persistence/couch/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const DEFAULT_NAMESPACE = '';
const LEGACY_SPACE = 'mct';

export default function CouchPlugin(options) {
function normalizeOptions(unnormalizedOptions) {
function normalizeOptions(unnnormalizedOptions) {
const normalizedOptions = {};
if (typeof unnormalizedOptions === 'string') {
if (typeof unnnormalizedOptions === 'string') {
normalizedOptions.databases = [
{
url: options,
Expand All @@ -41,19 +41,19 @@ export default function CouchPlugin(options) {
indicator: true
}
];
} else if (!unnormalizedOptions.databases) {
} else if (!unnnormalizedOptions.databases) {
normalizedOptions.databases = [
{
url: unnormalizedOptions.url,
url: unnnormalizedOptions.url,
namespace: DEFAULT_NAMESPACE,
additionalNamespaces: [LEGACY_SPACE],
readOnly: false,
useDesignDocuments: unnormalizedOptions.useDesignDocuments,
useDesignDocuments: unnnormalizedOptions.useDesignDocuments,
indicator: true
}
];
} else {
normalizedOptions.databases = unnormalizedOptions.databases;
normalizedOptions.databases = unnnormalizedOptions.databases;
}

// final sanity check, ensure we have all options
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/plot/configuration/XAxisModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default class XAxisModel extends Model {
*/
defaultModel(options) {
const bounds = options.openmct.time.bounds();
const timeSystem = options.openmct.time.getTimeSystem();
const timeSystem = options.openmct.time.timeSystem();
const format = options.openmct.telemetry.getFormatter(timeSystem.timeFormat);

/** @type {XAxisModelType} */
Expand Down
3 changes: 1 addition & 2 deletions src/plugins/plot/inspector/PlotOptionsItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ export default {
},
data() {
return {
expanded: false,
status: null
expanded: false
};
},
computed: {
Expand Down
12 changes: 2 additions & 10 deletions src/plugins/plot/legend/PlotLegend.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@

<div class="c-plot-legend__wrapper" :class="{ 'is-cursor-locked': cursorLocked }">
<!-- COLLAPSED PLOT LEGEND -->
<div
v-if="!isLegendExpanded"
class="plot-wrapper-collapsed-legend"
:class="{ 'is-cursor-locked': cursorLocked }"
>
<div class="plot-wrapper-collapsed-legend" :class="{ 'is-cursor-locked': cursorLocked }">
<div
class="c-state-indicator__alert-cursor-lock icon-cursor-lock"
title="Cursor is point locked. Click anywhere in the plot to unlock."
Expand All @@ -54,11 +50,7 @@
/>
</div>
<!-- EXPANDED PLOT LEGEND -->
<div
v-else
class="plot-wrapper-expanded-legend"
:class="{ 'is-cursor-locked': cursorLocked }"
>
<div class="plot-wrapper-expanded-legend" :class="{ 'is-cursor-locked': cursorLocked }">
<div
class="c-state-indicator__alert-cursor-lock--verbose icon-cursor-lock"
title="Click anywhere in the plot to unlock."
Expand Down
7 changes: 7 additions & 0 deletions src/styles/_legacy-plots.scss
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,13 @@ mct-plot {

.gl-plot,
.c-plot {
&.plot-legend-collapsed .plot-wrapper-expanded-legend {
display: none;
}
&.plot-legend-expanded .plot-wrapper-collapsed-legend {
display: none;
}

&.plot-legend-collapsed .icon-cursor-lock::before {
padding-right: 5px;
}
Expand Down

0 comments on commit 135e714

Please sign in to comment.