Skip to content

Commit f4d8638

Browse files
committed
Merge pull request #16 from jwforres/set_selector_error
Handle case where setLabelSelector gets called before filter widget i…
2 parents 8765a1a + ea0f8ce commit f4d8638

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

labelFilter.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,24 @@ angular.module('kubernetesUI')
5151

5252

5353
LabelFilter.prototype.setLabelSelector = function(labelSelector, dontFireCallbacks) {
54-
this._labelFilterActiveFiltersElement.empty();
54+
// This can potentially get called before the label filter has been created
55+
if (this._labelFilterActiveFiltersElement) {
56+
this._labelFilterActiveFiltersElement.empty();
57+
}
58+
5559
this._labelSelector = labelSelector;
5660

57-
if (!this._labelSelector.isEmpty()) {
58-
this._labelFilterActiveElement.show();
59-
var self = this;
60-
this._labelSelector.each(function(filter) {
61-
self._renderActiveFilter(filter);
62-
});
63-
}
64-
else {
65-
this._labelFilterActiveElement.hide();
61+
if (this._labelFilterActiveElement) {
62+
if (!this._labelSelector.isEmpty()) {
63+
this._labelFilterActiveElement.show();
64+
var self = this;
65+
this._labelSelector.each(function(filter) {
66+
self._renderActiveFilter(filter);
67+
});
68+
}
69+
else {
70+
this._labelFilterActiveElement.hide();
71+
}
6672
}
6773

6874
if (!dontFireCallbacks) {

0 commit comments

Comments
 (0)