diff options
| author | John Hill <jchill2.spam@gmail.com> | 2021-05-24 20:48:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 20:48:53 +0300 |
| commit | ab93ca9024f24443ca695dfc781e7adf0875673c (patch) | |
| tree | 3909e237c9a1098f100369186cc2e60e8386e14d | |
| parent | 80451935a9dae672316c15a955dec86881332f5f (diff) | |
| parent | 99896b72eabb8cd1bf98255cb7d89ed99f6ee701 (diff) | |
Merge branch 'master' into sprint-1.7.3sprint-1.7.3
| -rw-r--r-- | API.md | 2 | ||||
| -rw-r--r-- | src/plugins/displayLayout/DisplayLayoutToolbar.js | 2 | ||||
| -rw-r--r-- | src/plugins/flexibleLayout/toolbarProvider.js | 4 | ||||
| -rw-r--r-- | src/plugins/tabs/components/tabs.vue | 2 | ||||
| -rw-r--r-- | src/ui/layout/BrowseBar.vue | 2 |
5 files changed, 6 insertions, 6 deletions
@@ -423,7 +423,7 @@ attribute | type | flags | notes ###### Value Hints -Each telemetry value description has an object defining hints. Keys in this this object represent the hint itself, and the value represents the weight of that hint. A lower weight means the hint has a higher priority. For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice. Likewise, a table will use hints to determine the default order of columns. +Each telemetry value description has an object defining hints. Keys in this object represent the hint itself, and the value represents the weight of that hint. A lower weight means the hint has a higher priority. For example, multiple values could be hinted for use as the y-axis of a plot (raw, engineering), but the highest priority would be the default choice. Likewise, a table will use hints to determine the default order of columns. Known hints: diff --git a/src/plugins/displayLayout/DisplayLayoutToolbar.js b/src/plugins/displayLayout/DisplayLayoutToolbar.js index 15fa6d2ee..cb204bf72 100644 --- a/src/plugins/displayLayout/DisplayLayoutToolbar.js +++ b/src/plugins/displayLayout/DisplayLayoutToolbar.js @@ -235,7 +235,7 @@ define(['lodash'], function (_) { message: `Warning! This action will remove this item from the Display Layout. Do you want to continue?`, buttons: [ { - label: 'Ok', + label: 'OK', emphasis: 'true', callback: function () { removeItem(getAllTypes(selection)); diff --git a/src/plugins/flexibleLayout/toolbarProvider.js b/src/plugins/flexibleLayout/toolbarProvider.js index 064a995ac..27d00ac1e 100644 --- a/src/plugins/flexibleLayout/toolbarProvider.js +++ b/src/plugins/flexibleLayout/toolbarProvider.js @@ -97,7 +97,7 @@ function ToolbarProvider(openmct) { message: `This action will remove this frame from this Flexible Layout. Do you want to continue?`, buttons: [ { - label: 'Ok', + label: 'OK', emphasis: 'true', callback: function () { deleteFrameAction(primary.context.frameId); @@ -162,7 +162,7 @@ function ToolbarProvider(openmct) { message: 'This action will permanently delete this container from this Flexible Layout', buttons: [ { - label: 'Ok', + label: 'OK', emphasis: 'true', callback: function () { removeContainer(containerId); diff --git a/src/plugins/tabs/components/tabs.vue b/src/plugins/tabs/components/tabs.vue index 7754f71a1..8b5f9dc62 100644 --- a/src/plugins/tabs/components/tabs.vue +++ b/src/plugins/tabs/components/tabs.vue @@ -181,7 +181,7 @@ export default { message: `This action will remove this tab from the Tabs Layout. Do you want to continue?`, buttons: [ { - label: 'Ok', + label: 'OK', emphasis: 'true', callback: () => { this.composition.remove(childDomainObject); diff --git a/src/ui/layout/BrowseBar.vue b/src/ui/layout/BrowseBar.vue index 1b977883d..08a23d503 100644 --- a/src/ui/layout/BrowseBar.vue +++ b/src/ui/layout/BrowseBar.vue @@ -288,7 +288,7 @@ export default { message: 'Any unsaved changes will be lost. Are you sure you want to continue?', buttons: [ { - label: 'Ok', + label: 'OK', emphasis: true, callback: () => { this.openmct.editor.cancel().then(() => { |