Fix not showing login form (#564)

This commit is contained in:
Paulus Schoutsen 2017-11-04 12:47:28 -07:00 committed by GitHub
parent 6959b1849f
commit d2faeaffe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -72,6 +72,10 @@ class HomeAssistant extends Polymer.Element {
type: Object, type: Object,
value: null, value: null,
}, },
language: {
type: Object,
value: null,
},
showMain: { showMain: {
type: Boolean, type: Boolean,
computed: 'computeShowMain(hass)', computed: 'computeShowMain(hass)',
@ -97,7 +101,7 @@ class HomeAssistant extends Polymer.Element {
loadResources() { loadResources() {
window.getTranslation().then((result) => { window.getTranslation().then((result) => {
this._updateHass({ this._updateLanguage({
language: result.language, language: result.language,
resources: result.resources, resources: result.resources,
}); });
@ -154,7 +158,7 @@ class HomeAssistant extends Polymer.Element {
var auth = conn.options.authToken ? conn.options : {}; var auth = conn.options.authToken ? conn.options : {};
return window.hassCallApi(host, auth, method, path, parameters); return window.hassCallApi(host, auth, method, path, parameters);
}, },
}, this.$.storage.getStoredState()); }, this.language, this.$.storage.getStoredState());
var reconnected = () => { var reconnected = () => {
this._updateHass({ connected: true }); this._updateHass({ connected: true });
@ -252,7 +256,7 @@ class HomeAssistant extends Polymer.Element {
} }
selectLanguage(event) { selectLanguage(event) {
this._updateHass({ selectedLanguage: event.detail.language }); this._updateLanguage({ selectedLanguage: event.detail.language });
this.$.storage.storeState(); this.$.storage.storeState();
this.loadResources(); this.loadResources();
} }
@ -260,6 +264,11 @@ class HomeAssistant extends Polymer.Element {
_updateHass(obj) { _updateHass(obj) {
this.hass = Object.assign({}, this.hass, obj); this.hass = Object.assign({}, this.hass, obj);
} }
_updateLanguage(obj) {
this.language = Object.assign({}, this.language, obj);
if (this.hass) this._updateHass(obj);
}
} }
customElements.define(HomeAssistant.is, HomeAssistant); customElements.define(HomeAssistant.is, HomeAssistant);