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

Replace camera-preview card with picture-entity card. (#1393)

Browse Source
This commit is contained in:
Jerad Meisner 2018-07-03 06:28:54 -07:00 committed by Paulus Schoutsen
parent dc034038c0
commit c0ae7d50ad
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/panels/lovelace/cards/hui-camera-preview-card.js
View File

@ -1,15 +0,0 @@
import '../../../cards/ha-camera-card.js';
import LegacyWrapperCard from './hui-legacy-wrapper-card.js';
class HuiCameraPreviewCard extends LegacyWrapperCard {
constructor() {
super('ha-camera-card', 'camera');
}
getCardSize() {
return 4;
}
}
customElements.define('hui-camera-preview-card', HuiCameraPreviewCard);

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

@ -6,7 +6,6 @@ import '../components/hui-image.js';
import computeDomain from '../../../common/entity/compute_domain.js';
import computeStateDisplay from '../../../common/entity/compute_state_display.js';
import computeStateDomain from '../../../common/entity/compute_state_domain.js';
import computeStateName from '../../../common/entity/compute_state_name.js';
import toggleEntity from '../common/entity/toggle-entity.js';
@ -58,7 +57,7 @@ class HuiPictureEntityCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
hass="[[hass]]"
image="[[_config.image]]"
state-image="[[_config.state_image]]"
camera-image="[[_config.camera_image]]"
camera-image="[[_getCameraImage(_config)]]"
entity="[[_config.entity]]"
></hui-image>
<div class="info" hidden$='[[_computeHideInfo(_config)]]'>
@ -84,10 +83,16 @@ class HuiPictureEntityCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
}
setConfig(config) {
if (!config || !config.entity ||
(!config.image && !config.state_image && !config.camera_image)) {
if (!config || !config.entity) {
throw new Error('Error in card configuration.');
}
this._entityDomain = computeDomain(config.entity);
if (this._entityDomain !== 'camera' &&
(!config.image && !config.state_image && !config.camera_image)) {
throw new Error('No image source configured.');
}
this._config = config;
}
@ -125,8 +130,7 @@ class HuiPictureEntityCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
}
_computeStateLabel(stateObj) {
const domain = computeStateDomain(stateObj);
switch (domain) {
switch (this._entityDomain) {
case 'scene':
return this.localize('ui.card.scene.activate');
case 'script':
@ -145,22 +149,24 @@ class HuiPictureEntityCard extends EventsMixin(LocalizeMixin(PolymerElement)) {
_cardClicked() {
const entityId = this._config && this._config.entity;
const stateObj = this.hass.states[entityId];
if (!entityId || !stateObj) return;
if (!entityId || !(entityId in this.hass.states)) return;
if (this._config.tap_action !== 'toggle') {
this.fire('hass-more-info', { entityId });
return;
}
const domain = computeDomain(entityId);
if (domain === 'weblink') {
if (this._entityDomain === 'weblink') {
window.open(this.hass.states[entityId].state);
} else {
toggleEntity(this.hass, entityId);
}
}
_getCameraImage(config) {
return this._entityDomain === 'camera' ? config.entity : config.camera_image;
}
}
customElements.define('hui-picture-entity-card', HuiPictureEntityCard);

2
src/panels/lovelace/common/create-card-element.js
View File

@ -1,6 +1,5 @@
import fireEvent from '../../../common/dom/fire_event.js';
import '../cards/hui-camera-preview-card.js';
import '../cards/hui-entities-card.js';
import '../cards/hui-entity-filter-card.js';
import '../cards/hui-error-card.js';
@ -21,7 +20,6 @@ import '../cards/hui-weather-forecast-card';
import createErrorCardConfig from './create-error-card-config.js';
const CARD_TYPES = [
'camera-preview',
'entities',
'entity-filter',
'error',