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-31 00:09:47 -07:00
parent eefa863855
commit bcb5c0ad8f
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/pods/components/huegasm-app/component.js
View file

@ -46,12 +46,15 @@ export default Em.Component.extend({
var storage = new window.Locally.Store({ compress: true }); var storage = new window.Locally.Store({ compress: true });
this.set('storage', storage); this.set('storage', storage);
['bridgeIp', 'bridgeUsername', 'dimmerOn'].forEach((item) => { if(!Em.isNone(storage.get('huegasm.dimmerOn'))) {
var storedValue = storage.get('huegasm.' + item); this.set('dimmerOn', storage.get('huegasm.dimmerOn'));
}
if(storedValue) { if(!Em.isNone(storage.get('huegasm.bridgeIp')) && !Em.isNone(storage.get('huegasm.bridgeUsername'))) {
this.set(item, storage.get('huegasm.' + item)); this.setProperties({
} bridgeIp: storage.get('huegasm.bridgeIp'),
bridgeUsername: storage.get('huegasm.bridgeUsername')
}); });
} }
}
}); });

5
app/pods/components/music-tab/template.hbs
View file

@ -63,7 +63,7 @@
</ul> </ul>
{{#if playQueueNotEmpty}} {{#if playQueueNotEmpty}}
<div id="extraOptionsMenu"> <div id="extraOptionsMenu" class="hidden-xs">
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span> <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span> <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span> <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span>
@ -71,6 +71,9 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span>
{{#if usingMicSupported}} {{#if usingMicSupported}}
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="usingMicAudioTooltip" data-title={{usingMicAudioTooltipTxt}} {{action "useMicAudio"}}>{{paper-icon icon=micIcon class=usingMicAudioClass}}</span> <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="usingMicAudioTooltip" data-title={{usingMicAudioTooltipTxt}} {{action "useMicAudio"}}>{{paper-icon icon=micIcon class=usingMicAudioClass}}</span>
{{/if}} {{/if}}

14
app/styles/app.scss
View file

@ -137,6 +137,12 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
padding-top: 20px; padding-top: 20px;
} }
// preloading image
.readyBlock:after {
display: none;
content: url(images/pressButtonBridge.png);
}
.title { .title {
font-size: 30px; font-size: 30px;
margin-bottom: 30px; margin-bottom: 30px;
@ -217,10 +223,15 @@ md-list-item .md-no-style {
#hueControls { #hueControls {
max-width: 1200px; max-width: 1200px;
min-width: 400px;
position: relative; position: relative;
} }
// preload images
#hueControls:after, md-progress-circular:after {
display: none;
content: url(images/colormap.png) url(images/missingArtwork.png) url(images/sc-white.png) url(images/favicons/favicon-90x90.png) url(images/lights/a19.svg) url(images/lights/a19w.svg) url(images/lights/br30.svg) url(images/lights/br30w.svg) url(images/lights/gu10.svg) url(images/lights/gu10w.svg) url(images/lights/huego.svg) url(images/lights/huegow.svg) url(images/lights/lc_aura.svg) url(images/lights/lc_auraw.svg) url(images/lights/lc_bloom.svg) url(images/lights/lc_bloomw.svg) url(images/lights/lc_iris.svg) url(images/lights/lc_irisw.svg) url(images/lights/lightstrip.svg) url(images/lights/lightstripw.svg) url(images/lights/storylight.svg) url(images/lights/storylightw.svg);
}
.navigation { .navigation {
text-align: center; text-align: center;
padding: 30px 0; padding: 30px 0;
@ -464,6 +475,7 @@ md-toolbar {
#musicTab{ #musicTab{
padding: 0; padding: 0;
margin-bottom: $footerHeight + 50px;
} }
#slideToggle { #slideToggle {