ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-15 21:58:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

1.7.7 merge into master (#4155)

Browse Source 
* Merge 1.7.7 sprint branch into master

Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
Co-authored-by: Khalid Adil <khalidadil29@gmail.com>
This commit is contained in:
Shefali Joshi
2021-08-27 04:44:23 -07:00
committed by GitHub
parent f2b2953a5d
commit 9cb85ad176
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

2
src/plugins/condition/components/inspector/StylesView.vue
View File

@ -321,7 +321,7 @@ export default {
if (item) { if (item) {
const type = this.openmct.types.get(item.type); const type = this.openmct.types.get(item.type);
if (type && type.definition) { if (type && type.definition) {
creatable = (type.definition.creatable === true); creatable = (type.definition.creatable !== undefined && (type.definition.creatable === 'true' || type.definition.creatable === true));
} }
} }

8
src/plugins/displayLayout/components/EditMarquee.vue
View File

@ -28,19 +28,19 @@
> >
<div <div
class="c-frame-edit__handle c-frame-edit__handle--nw" class="c-frame-edit__handle c-frame-edit__handle--nw"
@mousedown="startResize([1,1], [-1,-1], $event)" @mousedown.left="startResize([1,1], [-1,-1], $event)"
></div> ></div>
<div <div
class="c-frame-edit__handle c-frame-edit__handle--ne" class="c-frame-edit__handle c-frame-edit__handle--ne"
@mousedown="startResize([0,1], [1,-1], $event)" @mousedown.left="startResize([0,1], [1,-1], $event)"
></div> ></div>
<div <div
class="c-frame-edit__handle c-frame-edit__handle--sw" class="c-frame-edit__handle c-frame-edit__handle--sw"
@mousedown="startResize([1,0], [-1,1], $event)" @mousedown.left="startResize([1,0], [-1,1], $event)"
></div> ></div>
<div <div
class="c-frame-edit__handle c-frame-edit__handle--se" class="c-frame-edit__handle c-frame-edit__handle--se"
@mousedown="startResize([0,0], [1,1], $event)" @mousedown.left="startResize([0,0], [1,1], $event)"
></div> ></div>
</div> </div>
</template> </template>

7
src/plugins/notebook/utils/notebook-storage.js
View File

@ -103,10 +103,13 @@ export function validateNotebookStorageObject() {
let valid = false; let valid = false;
if (notebookStorage) { if (notebookStorage) {
Object.entries(notebookStorage).forEach(([key, value]) => { const oldInvalidKeys = ['notebookMeta', 'page', 'section'];
valid = Object.entries(notebookStorage).every(([key, value]) => {
const validKey = key !== undefined && key !== null; const validKey = key !== undefined && key !== null;
const validValue = value !== undefined && value !== null; const validValue = value !== undefined && value !== null;
valid = validKey && validValue; const hasOldInvalidKeys = oldInvalidKeys.includes(key);
return validKey && validValue && !hasOldInvalidKeys;
}); });
} }