From 6d11d3cc65eb9d35c5f64d5c0139cbf5f7ae31c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Thu, 24 Jan 2019 10:53:32 +0100
Subject: [PATCH] Update for Home Assistant 0.86

---
 README.md          |  2 ++
 fold-entity-row.js | 28 ++++++++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 76e2933..7380c6f 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ Make a group from entities in a lovelace entities card - and fold them away when
 
 This card requires [card-tools](https://github.com/thomasloven/lovelace-card-tools) to be installed.
 
+For installation instructions [see this guide](https://github.com/thomasloven/hass-config/wiki/Lovelace-Plugins).
+
 ## Options
 
 | Name | Type | Default | Description
diff --git a/fold-entity-row.js b/fold-entity-row.js
index d91d2b2..7f500ab 100644
--- a/fold-entity-row.js
+++ b/fold-entity-row.js
@@ -1,5 +1,5 @@
-var LitElement = LitElement || Object.getPrototypeOf(customElements.get('hui-error-entity-row'));
-class FoldEntityRow extends LitElement {
+customElements.whenDefined('card-tools').then(() => {
+class FoldEntityRow extends cardTools.litElement() {
 
   static get properties() {
     return {
@@ -8,7 +8,7 @@ class FoldEntityRow extends LitElement {
   }
 
   render() {
-    return window.cardTools.litHtml`
+    return cardTools.litHtml()`
     ${this._renderStyle()}
     <div id=head>
       <div id=entity>
@@ -25,7 +25,7 @@ class FoldEntityRow extends LitElement {
   }
 
   _renderStyle() {
-    return window.cardTools.litHtml`
+    return cardTools.litHtml()`
     <style>
     #items {
       padding: 0 0 0 40px;
@@ -67,7 +67,7 @@ class FoldEntityRow extends LitElement {
   _renderElement(conf, options) {
     conf = (typeof conf === "string") ? {entity: conf} : conf;
     conf = Object.assign(conf, options);
-    const element = window.cardTools.createEntityRow(conf);
+    const element = cardTools.createEntityRow(conf);
     if(this._hass) element.hass = this._hass;
 
     const DOMAINS_HIDE_MORE_INFO = [
@@ -80,7 +80,7 @@ class FoldEntityRow extends LitElement {
     if (conf.entity && !DOMAINS_HIDE_MORE_INFO.includes(conf.entity.split(".")[0])) {
       element.classList.add("state-card-dialog");
       element.addEventListener("click", () => {
-        window.cardTools.moreInfo(conf.entity);
+        cardTools.moreInfo(conf.entity);
       });
     }
     return element;
@@ -101,13 +101,13 @@ class FoldEntityRow extends LitElement {
 
   _renderItem(conf, options) {
     const element = this._renderElement(conf, options);
-    return window.cardTools.litHtml`<div> ${element} </div>`;
+    return cardTools.litHtml()`<div> ${element} </div>`;
   }
 
   setConfig(config) {
     if(!this._config) {
-      if(!window.cardTools) throw new Error(`Can't find card-tools. See https://github.com/thomasloven/lovelace-card-tools`);
-      window.cardTools.checkVersion(0.1);
+      if(!cardTools) throw new Error(`Can't find card-tools. See https://github.com/thomasloven/lovelace-card-tools`);
+      cardTools.checkVersion(0.1);
       this._config = config;
       this._closed = !config.open;
 
@@ -119,7 +119,7 @@ class FoldEntityRow extends LitElement {
     if (config.entities)
       items = config.entities;
     if (head && head.split('.')[0] === "group")
-      items = window.cardTools.hass().states[head].attributes.entity_id;
+      items = cardTools.hass().states[head].attributes.entity_id;
 
     if(items)
       this._entities = items.map((e) => this._renderItem(e, config.group_config));
@@ -134,3 +134,11 @@ class FoldEntityRow extends LitElement {
 }
 
 customElements.define('fold-entity-row', FoldEntityRow);
+});
+
+window.setTimeout(() => {
+  if(customElements.get('card-tools')) return;
+  customElements.define('fold-entity-row', class extends HTMLElement{
+    setConfig() { throw new Error("Can't find card-tools. See https://github.com/thomasloven/lovelace-card-tools");}
+  });
+}, 2000);