jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-09 10:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Love: change keys from "name" to "title" (#1367)

Browse Source 
* Love: change keys from "name" to "title"

* Change action to tap_action
This commit is contained in:
c727 2018-06-29 16:08:04 +02:00 committed by GitHub
parent fb2fc9fbbb
commit 5b67a3691a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/panels/lovelace/cards/hui-picture-elements-card.js
View File

@ -89,7 +89,7 @@ class HuiPictureElementsCard extends LocalizeMixin(EventsMixin(PolymerElement))
if (element.type === 'state-badge') { if (element.type === 'state-badge') {
const entityId = element.entity; const entityId = element.entity;
el = document.createElement('state-badge'); el = document.createElement('state-badge');
el.addEventListener('click', () => this._handleClick(entityId, element.action === 'toggle')); el.addEventListener('click', () => this._handleClick(entityId, element.tap_action === 'toggle'));
el.classList.add('clickable'); el.classList.add('clickable');
this._requiresStateObj.push({ el, entityId }); this._requiresStateObj.push({ el, entityId });
} else if (element.type === 'state-text') { } else if (element.type === 'state-text') {

4
src/panels/lovelace/cards/hui-picture-entity-card.js
View File

@ -141,8 +141,8 @@ class HuiPictureEntityCard extends LocalizeMixin(PolymerElement) {
return; return;
} }
const stateDomain = computeDomain(entityId); const domain = computeDomain(entityId);
if (stateDomain === 'weblink') { if (domain === 'weblink') {
window.open(this.hass.states[entityId].state); window.open(this.hass.states[entityId].state);
} else { } else {
toggleEntity(this.hass, entityId); toggleEntity(this.hass, entityId);

14
src/panels/lovelace/hui-root.js
View File

@ -62,11 +62,11 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
<paper-tabs scrollable selected="[[_curView]]" on-iron-activate="_handleViewSelected"> <paper-tabs scrollable selected="[[_curView]]" on-iron-activate="_handleViewSelected">
<template is="dom-repeat" items="[[config.views]]"> <template is="dom-repeat" items="[[config.views]]">
<paper-tab> <paper-tab>
<template is="dom-if" if="[[item.tab_icon]]"> <template is="dom-if" if="[[item.icon]]">
<iron-icon title$="[[item.name]]" icon="[[item.tab_icon]]"></iron-icon> <iron-icon title$="[[item.title]]" icon="[[item.icon]]"></iron-icon>
</template> </template>
<template is="dom-if" if="[[!item.tab_icon]]"> <template is="dom-if" if="[[!item.icon]]">
[[_computeTabTitle(item)]] [[_computeTabTitle(item.title)]]
</template> </template>
</paper-tab> </paper-tab>
</template> </template>
@ -131,15 +131,15 @@ class HUIRoot extends NavigateMixin(EventsMixin(PolymerElement)) {
} }
_computeTitle(config) { _computeTitle(config) {
return config.name || 'Home Assistant'; return config.title || 'Home Assistant';
} }
_computeTabsHidden(views) { _computeTabsHidden(views) {
return views.length < 2; return views.length < 2;
} }
_computeTabTitle(view) { _computeTabTitle(title) {
return view.tab_title || view.name || 'Unnamed View'; return title || 'Unnamed view';
} }
_handleRefresh() { _handleRefresh() {