Skip to content

Commit 2ff260e

Browse files
authored
Merge pull request #32 from spadgett/clear-filter
Add LabelFilter.clear() method
2 parents cea1652 + 4de4658 commit 2ff260e

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

labelFilter.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,7 @@ angular.module('kubernetesUI')
184184
.text("Clear filters")
185185
)
186186
).click(function() {
187-
$(this).hide();
188-
self._labelFilterActiveFiltersElement
189-
.find('.label-filter-active-filter')
190-
.remove();
191-
self._clearActiveFilters();
187+
self.clear();
192188
});
193189

194190
// Create selectize widgets for the select fields and wire them together
@@ -392,6 +388,20 @@ angular.module('kubernetesUI')
392388
this._renderActiveFilter(filter);
393389
};
394390

391+
LabelFilter.prototype.clear = function() {
392+
if (this._labelFilterActiveFiltersElement) {
393+
this._labelFilterActiveFiltersElement.find('.label-filter-active-filter').remove();
394+
}
395+
396+
if (this._labelFilterActiveElement) {
397+
this._labelFilterActiveElement.hide();
398+
}
399+
400+
this._labelSelector.clearConjuncts();
401+
this._persistState();
402+
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
403+
};
404+
395405
LabelFilter.prototype._renderActiveFilter = function(filter) {
396406
// render the new filter indicator
397407
$('<a>')
@@ -423,12 +433,6 @@ angular.module('kubernetesUI')
423433
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
424434
};
425435

426-
LabelFilter.prototype._clearActiveFilters = function() {
427-
this._labelSelector.clearConjuncts();
428-
this._persistState();
429-
this._onActiveFiltersChangedCallbacks.fire(this._labelSelector);
430-
};
431-
432436
LabelFilter.prototype.toggleFilterWidget = function(show) {
433437
if (this._labelFilterRootElement) {
434438
if (show) {

0 commit comments

Comments
 (0)