Skip to content

Picture elements: add service-icon #1439

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
c727 merged 5 commits into from
Jul 12, 2018
Merged

Picture elements: add service-icon #1439

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b60b67f
Picture elements: add service-icon
c727 Jul 12, 2018
16df53b
Default for servie_data
c727 Jul 12, 2018
9819c14
Lint
Jul 12, 2018
9525919
Merge branch 'master' into love-pe-servive-icon
Jul 12, 2018
ade13ed
Remove file
c727 Jul 12, 2018
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
15 changes: 12 additions & 3 deletions src/panels/lovelace/cards/hui-picture-elements-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const VALID_TYPES = new Set([
'image',
'navigation',
'service-button',
'service-icon',
'state-badge',
'state-icon',
'state-label',
Expand Down Expand Up @@ -139,6 +140,13 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
el.innerText = element.title;
el.hass = this.hass;
break;
case 'service-icon':
el = document.createElement('ha-icon');
el.icon = element.icon;
el.title = element.title || '';
el.addEventListener('click', () => this._handleClick(element));
el.classList.add('clickable');
break;
case 'state-badge':
el = document.createElement('ha-state-label-badge');
el.state = this.hass.states[entityId];
Expand Down Expand Up @@ -232,16 +240,17 @@ class HuiPictureElementsCard extends NavigateMixin(EventsMixin(LocalizeMixin(Pol
}

_handleClick(elementConfig) {
const tapAction = elementConfig.tap_action || 'more_info';
const tapAction = elementConfig.tap_action || (elementConfig.type === 'service-icon' ?
'call-service' : 'more-info');

switch (tapAction) {
case 'more_info':
case 'more-info':
this.fire('hass-more-info', { entityId: elementConfig.entity });
break;
case 'toggle':
toggleEntity(this.hass, elementConfig.entity);
break;
case 'call_service': {
case 'call-service': {
const [domain, service] = elementConfig.service.split('.', 2);
const serviceData = Object.assign(
{}, { entity_id: elementConfig.entity },
Expand Down