Skip to content

Commit

Permalink
Merge pull request #1974 from home-assistant/dev
Browse files Browse the repository at this point in the history
20181103.0
  • Loading branch information
balloob committed Nov 3, 2018
2 parents ef40a0c + a3847dd commit 6a84395
Show file tree
Hide file tree
Showing 442 changed files with 6,557 additions and 6,056 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
@@ -0,0 +1,11 @@
# Ensure Docker script files uses LF to support Docker for Windows.
# Ensure "git config --global core.autocrlf input" before you clone
* text eol=lf
*.ts whitespace=error
*.js whitespace=error

*.ico binary
*.jpg binary
*.png binary
*.zip binary
*.mp3 binary
Binary file modified gallery/public/api/media_player_proxy/media_player.walkman
Binary file not shown.
14 changes: 7 additions & 7 deletions gallery/src/components/demo-card.js
@@ -1,13 +1,13 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";
import JsYaml from "js-yaml";

import HomeAssistant from "../data/hass.js";
import { demoConfig } from "../data/demo_config.js";
import HomeAssistant from "../data/hass";
import { demoConfig } from "../data/demo_config";
import { demoServices } from "../data/demo_services";
import demoResources from "../data/demo_resources.js";
import demoStates from "../data/demo_states.js";
import createCardElement from "../../../src/panels/lovelace/common/create-card-element.js";
import demoResources from "../data/demo_resources";
import demoStates from "../data/demo_states";
import createCardElement from "../../../src/panels/lovelace/common/create-card-element";

class DemoCard extends PolymerElement {
static get template() {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/components/demo-cards.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import "@polymer/app-layout/app-toolbar/app-toolbar.js";
import "@polymer/paper-toggle-button/paper-toggle-button.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";
import "@polymer/app-layout/app-toolbar/app-toolbar";
import "@polymer/paper-toggle-button/paper-toggle-button";

import "./demo-card.js";
import "./demo-card";

class DemoCards extends PolymerElement {
static get template() {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/components/demo-more-info.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../../../src/state-summary/state-card-content.js";
import "../../../src/dialogs/more-info/controls/more-info-content.js";
import "../../../src/components/ha-card.js";
import "../../../src/state-summary/state-card-content";
import "../../../src/dialogs/more-info/controls/more-info-content";
import "../../../src/components/ha-card";

class DemoMoreInfo extends PolymerElement {
static get template() {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/components/demo-more-infos.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import "@polymer/app-layout/app-toolbar/app-toolbar.js";
import "@polymer/paper-toggle-button/paper-toggle-button.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";
import "@polymer/app-layout/app-toolbar/app-toolbar";
import "@polymer/paper-toggle-button/paper-toggle-button";

import "./demo-more-info.js";
import "./demo-more-info";

class DemoMoreInfos extends PolymerElement {
static get template() {
Expand Down
4 changes: 3 additions & 1 deletion gallery/src/data/entity.js
Expand Up @@ -55,7 +55,9 @@ export class LightEntity extends Entity {

if (service === "turn_on") {
// eslint-disable-next-line
const { brightness, hs_color } = data;
let { brightness, hs_color, brightness_pct } = data;
// eslint-disable-next-line
brightness = (255 * brightness_pct) / 100;
this.update(
"on",
Object.assign(this.attributes, {
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/data/provide_hass.js
@@ -1,8 +1,8 @@
import { fireEvent } from "../../../src/common/dom/fire_event.js";
import { fireEvent } from "../../../src/common/dom/fire_event";

import { demoConfig } from "./demo_config.js";
import { demoConfig } from "./demo_config";
import { demoServices } from "./demo_services";
import demoResources from "./demo_resources.js";
import demoResources from "./demo_resources";

const ensureArray = (val) => (Array.isArray(val) ? val : [val]);

Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-alarm-panel-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("alarm_control_panel", "alarm", "disarmed", {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-conditional-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "controller_1", "on", {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-entities-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "bed_light", "on", {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-entity-button-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "bed_light", "on", {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-entity-filter-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("device_tracker", "demo_paulus", "work", {
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/demos/demo-hui-gauge-card.js
@@ -1,7 +1,7 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../components/demo-cards.js";
import "../components/demo-cards";

const CONFIGS = [
{
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-glance-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("device_tracker", "demo_paulus", "home", {
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/demos/demo-hui-iframe-card.js
@@ -1,7 +1,7 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../components/demo-cards.js";
import "../components/demo-cards";

const CONFIGS = [
{
Expand Down
48 changes: 48 additions & 0 deletions gallery/src/demos/demo-hui-light-card.js
@@ -0,0 +1,48 @@
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "bed_light", "on", {
friendly_name: "Bed Light",
brightness: 130,
}),
];

const CONFIGS = [
{
heading: "Basic example",
config: `
- type: light
entity: light.bed_light
`,
},
];

class DemoLightEntity extends PolymerElement {
static get template() {
return html`
<demo-cards id='demos' configs="[[_configs]]"></demo-cards>
`;
}

static get properties() {
return {
_configs: {
type: Object,
value: CONFIGS,
},
};
}

ready() {
super.ready();
const hass = provideHass(this.$.demos);
hass.addEntities(ENTITIES);
}
}

customElements.define("demo-hui-light-card", DemoLightEntity);
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-map-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("device_tracker", "demo_paulus", "not_home", {
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/demos/demo-hui-markdown-card.js
@@ -1,7 +1,7 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../components/demo-cards.js";
import "../components/demo-cards";

const CONFIGS = [
{
Expand Down
12 changes: 6 additions & 6 deletions gallery/src/demos/demo-hui-media-player-rows.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("media_player", "bedroom", "playing", {
Expand Down Expand Up @@ -65,7 +65,7 @@ const CONFIGS = [
- entity: media_player.living_room
name: Pause, No skip, tvshow
- entity: media_player.android_cast
name: Screen casting
name: Screen casting
- entity: media_player.lounge_room
name: Chromcast Idle
- entity: media_player.theater
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-picture-elements-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "bed_light", "on", {
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/demos/demo-hui-picture-entity-card.js
@@ -1,7 +1,7 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../components/demo-cards.js";
import "../components/demo-cards";

const CONFIGS = [
{
Expand Down
6 changes: 3 additions & 3 deletions gallery/src/demos/demo-hui-picture-glance-card.js
@@ -1,7 +1,7 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../components/demo-cards.js";
import "../components/demo-cards";

const CONFIGS = [
{
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-stack-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("light", "kitchen_lights", "on", {
Expand Down
10 changes: 5 additions & 5 deletions gallery/src/demos/demo-hui-thermostat-card.js
@@ -1,9 +1,9 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import "../components/demo-cards.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";
import "../components/demo-cards";

const ENTITIES = [
getEntity("climate", "ecobee", "auto", {
Expand Down
14 changes: 7 additions & 7 deletions gallery/src/demos/demo-more-info-light.js
@@ -1,13 +1,13 @@
import { html } from "@polymer/polymer/lib/utils/html-tag.js";
import { PolymerElement } from "@polymer/polymer/polymer-element.js";
import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";

import "../../../src/dialogs/more-info/controls/more-info-content.js";
import "../../../src/components/ha-card.js";
import "../../../src/dialogs/more-info/controls/more-info-content";
import "../../../src/components/ha-card";

import getEntity from "../data/entity.js";
import provideHass from "../data/provide_hass.js";
import getEntity from "../data/entity";
import provideHass from "../data/provide_hass";

import "../components/demo-more-infos.js";
import "../components/demo-more-infos";

/* eslint-disable no-unused-vars */

Expand Down

0 comments on commit 6a84395

Please sign in to comment.