From f1bad9e5f6ff950a79d5c390b864e79047ede2c1 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 12 Aug 2015 22:19:02 -0700 Subject: [PATCH] Home Assistant JS now returns class --- package.json | 2 +- src/components/entity-list.js | 2 +- src/components/events-list.js | 2 +- src/components/ha-sidebar.js | 2 +- src/components/ha-voice-command-progress.js | 2 +- src/components/logbook-entry.js | 2 +- src/components/relative-ha-datetime.js | 2 +- src/components/services-list.js | 2 +- src/components/state-cards.html | 2 +- src/components/state-cards.js | 2 +- src/components/stream-status.js | 2 +- src/dialogs/more-info-dialog.html | 2 +- src/dialogs/more-info-dialog.js | 4 ++-- src/home-assistant.js | 2 +- src/layouts/home-assistant-main.js | 2 +- src/layouts/login-form.js | 2 +- src/layouts/partial-dev-call-service.js | 2 +- src/layouts/partial-dev-fire-event.js | 2 +- src/layouts/partial-dev-set-state.js | 2 +- src/layouts/partial-history.js | 2 +- src/layouts/partial-logbook.js | 2 +- src/layouts/partial-states.html | 8 -------- src/layouts/partial-states.js | 2 +- src/managers/notification-manager.js | 2 +- src/more-infos/more-info-configurator.js | 2 +- src/more-infos/more-info-group.html | 2 +- src/more-infos/more-info-group.js | 4 ++-- src/more-infos/more-info-light.js | 2 +- src/more-infos/more-info-media_player.js | 2 +- src/more-infos/more-info-sun.js | 2 +- src/more-infos/more-info-thermostat.js | 2 +- src/more-infos/more-info-updater.js | 2 +- src/{cards => state-summary}/state-card-configurator.html | 0 src/{cards => state-summary}/state-card-configurator.js | 0 src/{cards => state-summary}/state-card-content.html | 0 src/{cards => state-summary}/state-card-content.js | 0 src/{cards => state-summary}/state-card-display.html | 0 src/{cards => state-summary}/state-card-display.js | 0 src/{cards => state-summary}/state-card-media_player.html | 0 src/{cards => state-summary}/state-card-media_player.js | 0 src/{cards => state-summary}/state-card-scene.html | 0 src/{cards => state-summary}/state-card-scene.js | 0 src/{cards => state-summary}/state-card-thermostat.html | 0 src/{cards => state-summary}/state-card-thermostat.js | 0 src/{cards => state-summary}/state-card-toggle.html | 0 src/{cards => state-summary}/state-card-toggle.js | 2 +- src/{cards => state-summary}/state-card.html | 0 src/{cards => state-summary}/state-card.js | 2 +- src/util/bound-nuclear-behavior.js | 2 +- src/util/home-assistant-js-instance.js | 3 +++ src/util/state-card-type.js | 4 ++-- src/util/validate-auth.js | 2 +- 52 files changed, 42 insertions(+), 47 deletions(-) rename src/{cards => state-summary}/state-card-configurator.html (100%) rename src/{cards => state-summary}/state-card-configurator.js (100%) rename src/{cards => state-summary}/state-card-content.html (100%) rename src/{cards => state-summary}/state-card-content.js (100%) rename src/{cards => state-summary}/state-card-display.html (100%) rename src/{cards => state-summary}/state-card-display.js (100%) rename src/{cards => state-summary}/state-card-media_player.html (100%) rename src/{cards => state-summary}/state-card-media_player.js (100%) rename src/{cards => state-summary}/state-card-scene.html (100%) rename src/{cards => state-summary}/state-card-scene.js (100%) rename src/{cards => state-summary}/state-card-thermostat.html (100%) rename src/{cards => state-summary}/state-card-thermostat.js (100%) rename src/{cards => state-summary}/state-card-toggle.html (100%) rename src/{cards => state-summary}/state-card-toggle.js (95%) rename src/{cards => state-summary}/state-card.html (100%) rename src/{cards => state-summary}/state-card.js (83%) create mode 100644 src/util/home-assistant-js-instance.js diff --git a/package.json b/package.json index bda7af3bed..877498178d 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "author": "Paulus Schoutsen (http://paulusschoutsen.nl)", "license": "MIT", "dependencies": { - "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#c345559ab7b8cc9b9bc1421dc22198df0a86740b", + "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#7bc70c0b75c274166ddba0d647356b6d0b7d696e", "lodash": "^3.10.1", "moment": "^2.10.6" }, diff --git a/src/components/entity-list.js b/src/components/entity-list.js index 5cb1482747..85a59532a7 100644 --- a/src/components/entity-list.js +++ b/src/components/entity-list.js @@ -1,4 +1,4 @@ -import { entityGetters } from 'home-assistant-js'; +import { entityGetters } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; import nuclearObserver from '../util/bound-nuclear-behavior'; diff --git a/src/components/events-list.js b/src/components/events-list.js index 2bc858e5c2..022df0422d 100644 --- a/src/components/events-list.js +++ b/src/components/events-list.js @@ -1,4 +1,4 @@ -import { eventGetters } from 'home-assistant-js'; +import { eventGetters } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; import nuclearObserver from '../util/bound-nuclear-behavior'; diff --git a/src/components/ha-sidebar.js b/src/components/ha-sidebar.js index 3aed22ea89..8db1b0da54 100644 --- a/src/components/ha-sidebar.js +++ b/src/components/ha-sidebar.js @@ -4,7 +4,7 @@ import { authActions, navigationActions, util -} from 'home-assistant-js'; +} from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; import nuclearObserver from '../util/bound-nuclear-behavior'; diff --git a/src/components/ha-voice-command-progress.js b/src/components/ha-voice-command-progress.js index defff0e5d3..020530b357 100644 --- a/src/components/ha-voice-command-progress.js +++ b/src/components/ha-voice-command-progress.js @@ -1,4 +1,4 @@ -import { voiceGetters } from 'home-assistant-js'; +import { voiceGetters } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; import nuclearObserver from '../util/bound-nuclear-behavior'; diff --git a/src/components/logbook-entry.js b/src/components/logbook-entry.js index fe5c2f451a..d6108d7dd6 100644 --- a/src/components/logbook-entry.js +++ b/src/components/logbook-entry.js @@ -1,4 +1,4 @@ -import { moreInfoActions } from 'home-assistant-js'; +import { moreInfoActions } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; diff --git a/src/components/relative-ha-datetime.js b/src/components/relative-ha-datetime.js index f250a3734e..307354f3a1 100644 --- a/src/components/relative-ha-datetime.js +++ b/src/components/relative-ha-datetime.js @@ -1,5 +1,5 @@ import moment from 'moment'; -import { util } from 'home-assistant-js'; +import { util } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; const UPDATE_INTERVAL = 60000; // 60 seconds diff --git a/src/components/services-list.js b/src/components/services-list.js index 54307fb774..6a06225383 100644 --- a/src/components/services-list.js +++ b/src/components/services-list.js @@ -1,4 +1,4 @@ -import { serviceGetters } from 'home-assistant-js'; +import { serviceGetters } from '../util/home-assistant-js-instance'; import Polymer from '../polymer'; import nuclearObserver from '../util/bound-nuclear-behavior'; diff --git a/src/components/state-cards.html b/src/components/state-cards.html index fa379740e6..f81512aaa8 100644 --- a/src/components/state-cards.html +++ b/src/components/state-cards.html @@ -1,6 +1,6 @@ - +