Home-Assistant
/
frontend
mirror of https://github.com/home-assistant/frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Home Assistant JS Websocket

pull/190/head
Paulus Schoutsen 2017-02-01 00:09:50 -08:00
parent 81949d1f42
commit a3528a1eb1
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -28,7 +28,7 @@
"author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)", "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"home-assistant-js-websocket": "^0.7.3" "home-assistant-js-websocket": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"bower": "^1.8.0", "bower": "^1.8.0",

4
src/app-core.js
View File

@ -6,7 +6,9 @@ window.HASS_DEMO = __DEMO__;
const init = window.createHassConnection = function (password) { const init = window.createHassConnection = function (password) {
const proto = window.location.protocol === 'https:' ? 'wss' : 'ws'; const proto = window.location.protocol === 'https:' ? 'wss' : 'ws';
const url = `${proto}://${window.location.host}/api/websocket`; const url = `${proto}://${window.location.host}/api/websocket`;
const options = {}; const options = {
setupRetry: 10,
};
if (password !== undefined) { if (password !== undefined) {
options.authToken = password; options.authToken = password;
} }

6
src/layouts/login-form.html
View File

@ -69,7 +69,7 @@
</div> </div>
<div id="validatebox" hidden$="[[!showSpinner]]"> <div id="validatebox" hidden$="[[!showSpinner]]">
<paper-spinner active="true"></paper-spinner><br /> <paper-spinner active="true"></paper-spinner><br />
<div class="validatemessage">Loading data</div> <div class="validatemessage">[[computeLoadingMsg(isValidating)]]</div>
</div> </div>
</div> </div>
</div> </div>
@ -127,6 +127,10 @@ Polymer({
window.removeInitMsg(); window.removeInitMsg();
}, },
computeLoadingMsg: function (isValidating) {
return isValidating ? 'Connecting' : 'Loading data';
},
computeShowSpinner: function (forceShowLoading, isValidating) { computeShowSpinner: function (forceShowLoading, isValidating) {
return forceShowLoading || isValidating; return forceShowLoading || isValidating;
}, },

6
yarn.lock
View File

@ -2802,9 +2802,9 @@ hoek@2.x.x:
version "2.16.3" version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
home-assistant-js-websocket@^0.7.3: home-assistant-js-websocket@^1.0.0:
version "0.7.3" version "1.0.0"
resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-0.7.3.tgz#e65ac99b59a0b2c623048457c259808d67030c7f" resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-1.0.0.tgz#d3c0f9e96002189e0b25c837e970d68204e8077c"
homedir-polyfill@^1.0.0: homedir-polyfill@^1.0.0:
version "1.0.1" version "1.0.1"