From 813268fcf8111685d908f23ee81dae3699450385 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 12 Jul 2015 21:06:47 -0700 Subject: [PATCH] Logbook entries are shown again --- package.json | 9 +++++---- src/components/ha-logbook.js | 2 ++ src/components/logbook-entry.js | 4 ++++ src/layouts/partial-logbook.js | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index da931bc0df..5056e03e26 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,10 @@ "js_dev_demo": "BUILD_DEMO=1 webpack --colors --progress -d --watch", "js_prod": "BUILD_DEV=0 webpack --colors --progress -p -d", "js_demo": "BUILD_DEV=0 BUILD_DEMO=1 webpack --colors --progress -p -d", - "frontend_html": "vulcanize --inline-css --inline-scripts --strip-comments src/home-assistant.html > build/frontend.vulcan.html", - "frontend_minify": "node scripts/minify.js", - "frontend_prod": "npm run js_prod && bower install && npm run frontend_html && npm run frontend_minify", - "frontend_demo": "npm run js_demo && bower install && npm run frontend_html && npm run frontend_minify" + "frontend_html": "vulcanize --inline-css --inline-scripts --strip-comments src/home-assistant.html > build/frontend.vulcan.html && node scripts/minify.js", + "frontend_prod": "npm run js_prod && bower install && npm run frontend_html", + "frontend_demo": "npm run js_demo && bower install && npm run frontend_html", + "setup_js_dev": "npm install && cd node_modules && rm -rf home-assistant-js && git clone https://github.com/balloob/home-assistant-js.git && cd home-assistant-js && npm install" }, "author": "Paulus Schoutsen (http://paulusschoutsen.nl)", "license": "MIT", @@ -22,6 +22,7 @@ "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#d6159b2654e070e13017bc8f99418246c5112d9a", "html-minifier": "^0.7.2", "lodash": "^3.10.0", + "moment": "^2.10.3", "node-libs-browser": "^0.5.2", "vulcanize": "^1.10.1", "webpack": "^1.10.1" diff --git a/src/components/ha-logbook.js b/src/components/ha-logbook.js index 4d58911890..1e4d6c2264 100644 --- a/src/components/ha-logbook.js +++ b/src/components/ha-logbook.js @@ -1,5 +1,7 @@ import Polymer from '../polymer'; +require('./logbook-entry'); + Polymer({ is: 'ha-logbook', diff --git a/src/components/logbook-entry.js b/src/components/logbook-entry.js index 81b6adb01b..2420c19028 100644 --- a/src/components/logbook-entry.js +++ b/src/components/logbook-entry.js @@ -2,6 +2,10 @@ import { moreInfoActions } from 'home-assistant-js'; import Polymer from '../polymer'; +require('./domain-icon'); +require('./display-time'); +require('./relative-ha-datetime'); + export default Polymer({ is: 'logbook-entry', diff --git a/src/layouts/partial-logbook.js b/src/layouts/partial-logbook.js index 01a1235520..eee377c5d4 100644 --- a/src/layouts/partial-logbook.js +++ b/src/layouts/partial-logbook.js @@ -1,3 +1,4 @@ +import moment from 'moment'; import { logbookGetters, logbookActions } from 'home-assistant-js'; import Polymer from '../polymer';