Fixed "controlling" title

thelevicole · Mar 26, 2018 · 5a28384 · 5a28384
1 parent 79e0997
commit 5a28384
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/assets/images/logo.svg b/assets/images/logo.svg
diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
@@ -191,6 +191,7 @@
 			},
 			set: function() {
 				app.controlling = {
+					title: this.group.name,
 					selector: 'group_id',
 					id: this.group.id,
 					data: this.group.lights
@@ -272,6 +273,7 @@
 			},
 			set: function() {
 				app.controlling = {
+					title: this.data.label,
 					selector: 'id',
 					id: this.data.id,
 					data: this.data

diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 	<div vue-app>
 
 		<header>
-			<span v-if="controlling">{{ controlling.label || controlling.name }}</span>
+			<span v-if="controlling">{{ controlling.title }}</span>
 			<img v-if="!controlling" src="./images/logo.svg" alt="LIFX" width="52" height="20">
 			<a v-on:click.prevent="logout" v-if="access_token && lights.length">Logout</a>
 		</header>

diff --git a/js/app.js b/js/app.js