mirror of
https://github.com/nasa/openmct.git
synced 2025-06-01 15:10:50 +00:00
Merge branch 'master' into f#2594
This commit is contained in:
commit
b6220288ac
2
API.md
2
API.md
@ -231,7 +231,7 @@ attributes
|
|||||||
of this object. This is used for specifying an icon to appear next to each
|
of this object. This is used for specifying an icon to appear next to each
|
||||||
object of this type.
|
object of this type.
|
||||||
|
|
||||||
The [Open MCT Tutorials](https://github.com/openmct/openmct-tutorial) provide a
|
The [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial) provide a
|
||||||
step-by-step examples of writing code for Open MCT that includes a [section on
|
step-by-step examples of writing code for Open MCT that includes a [section on
|
||||||
defining a new object type](https://github.com/nasa/openmct-tutorial#step-3---providing-objects).
|
defining a new object type](https://github.com/nasa/openmct-tutorial#step-3---providing-objects).
|
||||||
|
|
||||||
|
@ -377,13 +377,17 @@ define([
|
|||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
updateFiltersAndRefresh: function (updatedFilters) {
|
updateFiltersAndRefresh: function (updatedFilters) {
|
||||||
this.filters = updatedFilters;
|
if (this.filters) {
|
||||||
this.reset();
|
this.filters = updatedFilters;
|
||||||
if (this.unsubscribe) {
|
this.reset();
|
||||||
this.unsubscribe();
|
if (this.unsubscribe) {
|
||||||
delete this.unsubscribe;
|
this.unsubscribe();
|
||||||
|
delete this.unsubscribe;
|
||||||
|
}
|
||||||
|
this.fetch();
|
||||||
|
} else {
|
||||||
|
this.filters = updatedFilters;
|
||||||
}
|
}
|
||||||
this.fetch();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user