Home Assistant JS now returns class

package.json

@@ -16,7 +16,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (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"
   },

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';

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';

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';

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';

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';
 

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

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';

src/components/state-cards.html

@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../cards/state-card.html">
+<link rel="import" href="../state-summary/state-card.html">
 
 <dom-module id="state-cards">
   <style>

src/components/state-cards.js

@@ -1,6 +1,6 @@
 import Polymer from '../polymer';
 
-require('../cards/state-card');
+require('../state-summary/state-card');
 
 export default new Polymer({
   is: 'state-cards',

src/components/stream-status.js

@@ -1,4 +1,4 @@
-import { streamGetters, streamActions } from 'home-assistant-js';
+import { streamGetters, streamActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/dialogs/more-info-dialog.html

@@ -5,7 +5,7 @@
 <!-- <link rel="import" href="../../bower_components/neon-animation/animations/slide-up-animation.html">
 <link rel="import" href="../../bower_components/neon-animation/animations/slide-down-animation.html">
  -->
-<link rel="import" href="../cards/state-card-content.html">
+<link rel="import" href="../state-summary/state-card-content.html">
 <link rel="import" href="../components/state-history-charts.html">
 <link rel="import" href="../more-infos/more-info-content.html">
 

src/dialogs/more-info-dialog.js

@@ -4,12 +4,12 @@ import {
   entityHistoryActions,
   moreInfoGetters,
   moreInfoActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
-require('../cards/state-card-content');
+require('../state-summary/state-card-content');
 require('../components/state-history-charts');
 require('../more-infos/more-info-content');
 

src/home-assistant.js

@@ -4,7 +4,7 @@ import {
   syncGetters,
   localStoragePreferences,
   startLocalStoragePreferencesSync
-} from 'home-assistant-js';
+} from './util/home-assistant-js-instance';
 
 import nuclearObserver from './util/bound-nuclear-behavior';
 import validateAuth from './util/validate-auth';

src/layouts/home-assistant-main.js

@@ -2,7 +2,7 @@ import {
   navigationGetters,
   startUrlSync,
   stopUrlSync,
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 

src/layouts/login-form.js

@@ -1,6 +1,6 @@
 import Polymer from '../polymer';
 
-import { authGetters } from 'home-assistant-js';
+import { authGetters } from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 import validateAuth from '../util/validate-auth';

src/layouts/partial-dev-call-service.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 

src/layouts/partial-dev-fire-event.js

@@ -1,4 +1,4 @@
-import { eventActions } from 'home-assistant-js';
+import { eventActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 

src/layouts/partial-dev-set-state.js

@@ -1,4 +1,4 @@
-import { reactor, entityGetters, entityActions } from 'home-assistant-js';
+import { reactor, entityGetters, entityActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 

src/layouts/partial-history.js

@@ -1,7 +1,7 @@
 import {
   entityHistoryGetters,
   entityHistoryActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/layouts/partial-logbook.js

@@ -1,4 +1,4 @@
-import { logbookGetters, logbookActions } from 'home-assistant-js';
+import { logbookGetters, logbookActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/layouts/partial-states.html

@@ -28,14 +28,6 @@
       line-height: 2em;
       cursor: pointer;
     }
-
-    .interimTranscript {
-      color: darkgrey;
-    }
-
-    .listening paper-spinner {
-      float: right;
-    }
   </style>
 
   <template>

src/layouts/partial-states.js

@@ -8,7 +8,7 @@ import {
   syncActions,
   voiceActions,
   util
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/managers/notification-manager.js

@@ -1,4 +1,4 @@
-import { notificationGetters } from 'home-assistant-js';
+import { notificationGetters } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/more-infos/more-info-configurator.js

@@ -2,7 +2,7 @@ import {
   streamGetters,
   syncActions,
   serviceActions
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';

src/more-infos/more-info-group.html

@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../cards/state-card-content.html">
+<link rel="import" href="../state-summary/state-card-content.html">
 
 <dom-module id="more-info-group">
   <style>

src/more-infos/more-info-group.js

@@ -1,12 +1,12 @@
 import {
   entityGetters,
   moreInfoGetters
-} from 'home-assistant-js';
+} from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
-require('../cards/state-card-content');
+require('../state-summary/state-card-content');
 
 export default new Polymer({
   is: 'more-info-group',

src/more-infos/more-info-light.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';

src/more-infos/more-info-media_player.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';

src/more-infos/more-info-sun.js

@@ -1,4 +1,4 @@
-import { util } from 'home-assistant-js';
+import { util } from '../util/home-assistant-js-instance';
 
 import formatTime from '../util/format-time';
 

src/more-infos/more-info-thermostat.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';

src/more-infos/more-info-updater.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 export default new Polymer({
   is: 'more-info-updater',

src/state-summary/state-card-toggle.js

@@ -1,4 +1,4 @@
-import { serviceActions } from 'home-assistant-js';
+import { serviceActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 

src/state-summary/state-card.js

@@ -1,4 +1,4 @@
-import { moreInfoActions } from 'home-assistant-js';
+import { moreInfoActions } from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 

src/util/bound-nuclear-behavior.js

@@ -1,4 +1,4 @@
-import { reactor } from 'home-assistant-js';
+import { reactor } from '../util/home-assistant-js-instance';
 
 import nuclearObserver from './nuclear-behavior';
 

src/util/home-assistant-js-instance.js

@@ -0,0 +1,3 @@
+import HomeAssistant from 'home-assistant-js';
+
+export default new HomeAssistant();

src/util/state-card-type.js

@@ -1,4 +1,4 @@
-import { reactor, serviceGetters } from 'home-assistant-js';
+import { reactor, serviceGetters } from '../util/home-assistant-js-instance';
 
 const DOMAINS_WITH_CARD = [
   'thermostat', 'configurator', 'scene', 'media_player'];
@@ -6,7 +6,7 @@ const DOMAINS_WITH_CARD = [
 export default function stateCardType(state) {
   if (DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {
     return state.domain;
-  } else if (reactor.evaluate(serviceGetters.canToggle(state.entityId))) {
+  } else if (reactor.evaluate(serviceGetters.canToggleEntity(state.entityId))) {
     return 'toggle';
   }
   return 'display';

src/util/validate-auth.js

@@ -1,4 +1,4 @@
-import { authActions, localStoragePreferences } from 'home-assistant-js';
+import { authActions, localStoragePreferences } from '../util/home-assistant-js-instance';
 
 export default function(authToken, rememberAuth) {
   authActions.validate(authToken, {