ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 18:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into new-widget

Browse Source
This commit is contained in:
charlesh88 2020-03-25 17:16:23 -07:00
commit 6ff5ce78e1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/plot/src/configuration/PlotSeries.js
View File

@ -377,8 +377,10 @@ define([
* @public
*/
updateFiltersAndRefresh: function (updatedFilters) {
if (this.filters && !_.isEqual(this.filters, updatedFilters)) {
this.filters = updatedFilters;
let deepCopiedFilters = JSON.parse(JSON.stringify(updatedFilters));
if (this.filters && !_.isEqual(this.filters, deepCopiedFilters)) {
this.filters = deepCopiedFilters;
this.reset();
if (this.unsubscribe) {
this.unsubscribe();
@ -386,7 +388,7 @@ define([
}
this.fetch();
} else {
this.filters = updatedFilters;
this.filters = deepCopiedFilters;
}
}
});

2
src/plugins/telemetryTable/TelemetryTable.js
View File

@ -181,7 +181,7 @@ define([
}
refreshData(bounds, isTick) {
if (!isTick) {
if (!isTick && this.outstandingRequests === 0) {
this.filteredRows.clear();
this.boundedRows.clear();
this.boundedRows.sortByTimeSystem(this.openmct.time.timeSystem());