Skip to content

Fix undefined on plant/weather card #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zsarnett merged 1 commit into from
Dec 16, 2018
+4 −2
Merged

Fix undefined on plant/weather card #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cards/ha-plant-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class HaPlantCard extends EventsMixin(PolymerElement) {
}

computeTitle(stateObj) {
return this.config.name || computeStateName(stateObj);
return (this.config && this.config.name) || computeStateName(stateObj);
}

computeAttributes(data) {
Expand Down
4 changes: 3 additions & 1 deletion src/cards/ha-weather-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
opacity: var(--dark-primary-opacity);
padding: 24px 16px 16px;
display: flex;
align-items: baseline;
}

.name {
Expand Down Expand Up @@ -195,6 +196,7 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
static get properties() {
return {
hass: Object,
config: Object,
stateObj: Object,
forecast: {
type: Array,
Expand Down Expand Up @@ -274,7 +276,7 @@ class HaWeatherCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
}

computeName(stateObj) {
return this.config.name || computeStateName(stateObj);
return (this.config && this.config.name) || computeStateName(stateObj);
}

showWeatherIcon(condition) {
Expand Down