jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on get panels from websocket package (#1264)

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-06-12 09:28:41 -04:00 committed by GitHub
parent 9717166fee
commit 7f133d0316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ha-sidebar.js
View File

@ -171,7 +171,7 @@ class HaSidebar extends
}
computePanels(hass) {
var panels = hass.config.panels;
var panels = hass.panels;
var sortValue = {
map: 1,
logbook: 2,

13
src/entrypoints/app.js
View File

@ -104,7 +104,7 @@ class HomeAssistant extends LocalizeMixin(PolymerElement) {
}
computeShowMain(hass) {
return hass && hass.states && hass.config;
return hass && hass.states && hass.config && hass.panels;
}
computeShowLoading(connectionPromise, hass) {
@ -176,6 +176,7 @@ class HomeAssistant extends LocalizeMixin(PolymerElement) {
states: null,
config: null,
themes: null,
panels: null,
panelUrl: this.panelUrl,
language: getActiveTranslation(),
@ -240,6 +241,7 @@ class HomeAssistant extends LocalizeMixin(PolymerElement) {
var reconnected = () => {
this._updateHass({ connected: true });
this.loadBackendTranslations();
this._loadPanels();
};
const disconnected = () => {
@ -275,6 +277,8 @@ class HomeAssistant extends LocalizeMixin(PolymerElement) {
unsubConfig = unsub;
});
this._loadPanels();
var unsubThemes;
@ -379,6 +383,13 @@ class HomeAssistant extends LocalizeMixin(PolymerElement) {
}
}
_loadPanels() {
this.connection.sendMessagePromise({
type: 'get_panels'
}).then(msg => this._updateHass({ panels: msg.result }));
}
_updateHass(obj) {
this.hass = Object.assign({}, this.hass, obj);
}

2
src/layouts/partial-panel-resolver.js
View File

@ -213,7 +213,7 @@ class PartialPanelResolver extends NavigateMixin(PolymerElement) {
}
computeCurrentPanel(hass) {
return hass.config.panels[hass.panelUrl];
return hass.panels[hass.panelUrl];
}
}