lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fixes

Browse source
This commit is contained in:
lone-cloud 2015-10-09 00:36:46 -07:00
parent 4dd928564a
commit 444d4c7a4d
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/pods/components/hue-controls/component.js
View file

@ -138,8 +138,10 @@ export default Em.Component.extend({
}; };
Em.$.get(this.get('apiURL') + '/lights', function (result, status) { Em.$.get(this.get('apiURL') + '/lights', function (result, status) {
if (status === 'success' && JSON.stringify(self.get('lightsData')) !== JSON.stringify(result) ) { if (status === 'success' && Em.isNone(result[0])) {
self.set('lightsData', result); self.set('lightsData', result);
} else {
fail();
} }
}).fail(fail); }).fail(fail);
}, },

4
app/pods/components/music-tab/component.js
View file

@ -453,12 +453,12 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
light; light;
if(randomTransition) { if(randomTransition) {
lightBopIndex = Math.floor(Math.random() * activeLights.length) + 1; lightBopIndex = Math.floor(Math.random() * activeLights.length);
// let's try not to select the same light twice in a row // let's try not to select the same light twice in a row
if(activeLights.length > 1) { if(activeLights.length > 1) {
while(lightBopIndex === lastLightBopIndex) { while(lightBopIndex === lastLightBopIndex) {
lightBopIndex = Math.floor(Math.random() * activeLights.length) + 1; lightBopIndex = Math.floor(Math.random() * activeLights.length);
} }
} }
} else { } else {

2
app/pods/components/music-tab/mixins/music-tab.js
View file

@ -257,7 +257,7 @@ export default Em.Mixin.create({
this.$('#dimmer').fadeTo(400, opacity, function() { this.$('#dimmer').fadeTo(400, opacity, function() {
if(opacity === 0) { if(opacity === 0) {
$(this).hide(); Em.$(this).hide();
} }
}); });
}.observes('dimmerOn'), }.observes('dimmerOn'),

6
app/styles/app.scss
View file

@ -405,7 +405,7 @@ md-toolbar {
#slideToggle { #slideToggle {
color: $playerDefaultIconColor; color: $playerDefaultIconColor;
background: #8C3E3E; background: #730B07;
div md-icon { div md-icon {
color: inherit !important; color: inherit !important;
} }
@ -967,3 +967,7 @@ $vibrateblurouter: 2px;
color: #F12B24 !important; color: #F12B24 !important;
font-size: 30px; font-size: 30px;
} }
.md-warn {
background: $secondaryThemeColor;
}

2
bower.json
View file

@ -15,7 +15,7 @@
"jquery": "~2.1.4", "jquery": "~2.1.4",
"jquery-mousewheel": "~3.1.13", "jquery-mousewheel": "~3.1.13",
"loader.js": "ember-cli/loader.js#3.2.0", "loader.js": "ember-cli/loader.js#3.2.0",
"locallyjs": "~0.3.1", "locallyjs": "~0.3.2",
"matchMedia": "~0.2.0", "matchMedia": "~0.2.0",
"nouislider": "^8.0.1", "nouislider": "^8.0.1",
"qunit": "~1.18.0", "qunit": "~1.18.0",