Skip to content

Commit

Permalink
Merge branch 'Sbado-master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasloven committed Oct 28, 2020
2 parents 2528494 + ec7b426 commit 14bb73a
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 66 deletions.
6 changes: 3 additions & 3 deletions custom_components/browser_mod/browser_mod.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions custom_components/browser_mod/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"more-info",
"set-theme",
"lovelace-reload",
"window-reload",
"blackout",
"no-blackout",
"toast",
Expand Down
1 change: 1 addition & 0 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class BrowserMod extends ext(BrowserModConnection, [
navigate: (msg) => this.do_navigate(msg.navigation_path),
"set-theme": (msg) => this.set_theme(msg),
"lovelace-reload": (msg) => this.lovelace_reload(msg),
"window-reload": () => window.location.reload(false),

blackout: (msg) => this.do_blackout(msg.time ? parseInt(msg.time) : undefined),
"no-blackout": (msg) => {
Expand Down
136 changes: 75 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "browser_mod",
"private": true,
"version": "1.2.2",
"version": "1.2.3",
"description": "",
"scripts": {
"build": "webpack",
Expand All @@ -12,7 +12,7 @@
"author": "Thomas Lovén",
"license": "MIT",
"devDependencies": {
"webpack": "^4.44.1",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12"
},
"dependencies": {
Expand Down

0 comments on commit 14bb73a

Please sign in to comment.