From 6cb47fb8aa3ebbbbe3b51c32d0e89ba7a2e668a9 Mon Sep 17 00:00:00 2001 From: Egor Philippov Date: Mon, 6 Feb 2017 23:52:04 -0800 Subject: [PATCH] minor stuff --- .../pods/components/hue-controls/component.js | 18 ++---------------- mobile/vendor/dancer.js | 6 +++--- .../pods/components/hue-controls/component.js | 18 ++---------------- web/vendor/dancer.js | 6 +++--- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/mobile/app/pods/components/hue-controls/component.js b/mobile/app/pods/components/hue-controls/component.js index a3e98f9..ced93f2 100644 --- a/mobile/app/pods/components/hue-controls/component.js +++ b/mobile/app/pods/components/hue-controls/component.js @@ -13,22 +13,8 @@ const { export default Component.extend({ classNames: ['container-fluid'], elementId: 'hue-controls', - lightsData: { - 1: { - modelid: 'LCT001', - name: 'light 1', - state: { - reachable: true - } - }, - 2: { - name: 'teeeeeeeeeest', - modelid: 'LCT002', - state: { - reachable: true - } - } - }, + lightsData: null, + activeLights: A(), tabList: ["Lights", "Music"], selectedTab: 1, diff --git a/mobile/vendor/dancer.js b/mobile/vendor/dancer.js index aa43e40..331626b 100644 --- a/mobile/vendor/dancer.js +++ b/mobile/vendor/dancer.js @@ -382,10 +382,10 @@ var adapter = function ( dancer ) { var context; - if('webkitAudioContext' in window) { - context = new webkitAudioContext(); - } else { + if('AudioContext' in window) { context = new AudioContext(); + } else { + context = new webkitAudioContext(); } this.dancer = dancer; diff --git a/web/app/pods/components/hue-controls/component.js b/web/app/pods/components/hue-controls/component.js index af84591..e19041e 100644 --- a/web/app/pods/components/hue-controls/component.js +++ b/web/app/pods/components/hue-controls/component.js @@ -14,22 +14,8 @@ const { export default Component.extend({ classNames: ['container-fluid'], elementId: 'hue-controls', - lightsData: { - 1: { - modelid: 'LCT001', - name: 'light 1', - state: { - reachable: true - } - }, - 2: { - name: 'teeeeeeeeeest', - modelid: 'LCT002', - state: { - reachable: true - } - } - }, + lightsData: null, + activeLights: A(), tabList: ["Lights", "Music"], selectedTab: 1, diff --git a/web/vendor/dancer.js b/web/vendor/dancer.js index ef7a71a..72d2894 100644 --- a/web/vendor/dancer.js +++ b/web/vendor/dancer.js @@ -382,10 +382,10 @@ var adapter = function ( dancer ) { var context; - if('webkitAudioContext' in window) { - context = new webkitAudioContext(); - } else { + if('AudioContext' in window) { context = new AudioContext(); + } else { + context = new webkitAudioContext(); } this.dancer = dancer;