diff --git a/bower.json b/bower.json index c302a04b8d..73309d5069 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "font-roboto-local": "^1.0.1", "iron-flex-layout": "^1.3.1", "paper-scroll-header-panel": "1.0.16", - "app-elements": "^0.9.0", "app-layout": "^0.10.1" }, "_comment": "added to get min version for iron-flex-layout, paper-scroll-header-panel" diff --git a/home-assistant-js b/home-assistant-js index 11a648c293..adcbd4488d 160000 --- a/home-assistant-js +++ b/home-assistant-js @@ -1 +1 @@ -Subproject commit 11a648c2931f4f381af439b1c52d9ff028bd0626 +Subproject commit adcbd4488dc31dbe422e971822c3036269c7f6b2 diff --git a/src/components/ha-cards.html b/src/components/ha-cards.html index 092f569498..49b2cd2bbd 100644 --- a/src/components/ha-cards.html +++ b/src/components/ha-cards.html @@ -147,27 +147,20 @@ updateCards: function (columns, states, showIntroduction, panelVisible, viewVisible) { + /* eslint-disable no-console */ if (!panelVisible || !viewVisible) { - console.log('cancelling update cards', - this.getAttribute('data-view') || 'default-view', - panelVisible, viewVisible); return; } - console.log('updateCards', this.getAttribute('data-view') || 'default-view', - panelVisible, viewVisible); this.debounce( - 'updateCards', - function () { this.cards = this.computeCards(columns, states, - showIntroduction); } - ); + 'updateCards', function () { + // Things might have changed since it got scheduled. + if (this.panelVisible && this.viewVisible) { + this.cards = this.computeCards(columns, states, showIntroduction); + } + }.bind(this)); }, computeCards: function (columns, states, showIntroduction) { - // Things might have changed since it got scheduled. - if (!this.panelVisible || !this.viewVisible) { - return; - } - console.error('computeCards', this.getAttribute('data-view') || 'default-view', states.size, this.viewVisible) var hass = this.hass; var byDomain = states.groupBy(function (entity) { return entity.domain; }); var hasGroup = {}; diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html index cd900f341f..304d9b521a 100644 --- a/src/components/ha-sidebar.html +++ b/src/components/ha-sidebar.html @@ -175,7 +175,7 @@ Polymer({ selected: { type: String, bindNuclear: function (hass) { - return hass.navigationGetters.activePane; + return hass.navigationGetters.activePanelName; }, }, @@ -197,7 +197,7 @@ Polymer({ type: Array, bindNuclear: function (hass) { return [ - hass.panelGetters.panels, + hass.navigationGetters.panels, function (res) { return res.toJS(); }, ]; }, diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html index 09bb5bb662..a641983e50 100644 --- a/src/layouts/home-assistant-main.html +++ b/src/layouts/home-assistant-main.html @@ -29,7 +29,7 @@ main attr-for-selected='id' fallback-selection='panel-resolver' - selected='[[activePane]]' + selected='[[activePanel]]' selected-attribute='panel-visible' > + @@ -10,6 +11,7 @@ +