ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-03 03:46:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.7.6 master merge (#4097)

Browse Source 
* remove can edit from hyperlink (#4076)

* Add check for stop observing before calling it (#4080)

* Set the yKey value on the series when it's changed (#4083)

* [Imagery] Click on image to get a large view #3582 (#4085)

fixed issue where large imagery view opens only once.

Co-authored-by: Henry Hsu <hhsu0219@gmail.com>
Co-authored-by: Nikhil <nikhil.k.mandlik@nasa.gov>
This commit is contained in:
Shefali Joshi 2021-08-10 07:00:13 -07:00 committed by GitHub
parent fe928a1386
commit f42fe78acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/hyperlink/HyperlinkProvider.js
View File

@ -33,10 +33,6 @@ export default function HyperlinkProvider(openmct) {
return domainObject.type === 'hyperlink'; return domainObject.type === 'hyperlink';
}, },
canEdit(domainObject) {
return domainObject.type === 'hyperlink';
},
view: function (domainObject) { view: function (domainObject) {
let component; let component;

6
src/plugins/persistence/couch/CouchObjectProvider.js
View File

@ -378,7 +378,7 @@ export default class CouchObjectProvider {
this.observers[keyString] = this.observers[keyString].filter(observer => observer !== callback); this.observers[keyString] = this.observers[keyString].filter(observer => observer !== callback);
if (this.observers[keyString].length === 0) { if (this.observers[keyString].length === 0) {
delete this.observers[keyString]; delete this.observers[keyString];
if (Object.keys(this.observers).length === 0) { if (Object.keys(this.observers).length === 0 && this.isObservingObjectChanges()) {
this.stopObservingObjectChanges(); this.stopObservingObjectChanges();
} }
} }
@ -436,7 +436,7 @@ export default class CouchObjectProvider {
if (!this.changesFeedSharedWorker) { if (!this.changesFeedSharedWorker) {
this.changesFeedSharedWorker = this.startSharedWorker(); this.changesFeedSharedWorker = this.startSharedWorker();
if (typeof this.stopObservingObjectChanges === 'function') { if (this.isObservingObjectChanges()) {
this.stopObservingObjectChanges(); this.stopObservingObjectChanges();
} }
@ -458,7 +458,7 @@ export default class CouchObjectProvider {
let error = false; let error = false;
if (typeof this.stopObservingObjectChanges === 'function') { if (this.isObservingObjectChanges()) {
this.stopObservingObjectChanges(); this.stopObservingObjectChanges();
} }

2
src/plugins/plot/MctPlot.vue
View File

@ -936,7 +936,7 @@ export default {
}, },
setYAxisKey(yKey) { setYAxisKey(yKey) {
this.config.series.models[0].emit('change:yKey', yKey); this.config.series.models[0].set('yKey', yKey);
}, },
pause() { pause() {