diff --git a/app/pods/components/huegasm-app/component.js b/app/pods/components/huegasm-app/component.js index 2eb2937..92e65b8 100644 --- a/app/pods/components/huegasm-app/component.js +++ b/app/pods/components/huegasm-app/component.js @@ -23,18 +23,22 @@ export default Em.Component.extend({ dimmerOnClass: function(){ var dimmerOn = this.get('dimmerOn'), - storage = this.get('storage'); + storage = this.get('storage'), + dimmerOnClass = null; if(dimmerOn){ Em.$('body').addClass('dimmerOn'); Em.$('html').addClass('dimmerOn'); + dimmerOnClass = 'active'; } else { Em.$('body').removeClass('dimmerOn'); Em.$('html').removeClass('dimmerOn'); } storage.set('huegasm.dimmerOn', dimmerOn); - }.observes('dimmerOn'), + + return dimmerOnClass; + }.property('dimmerOn'), init(){ this._super(); diff --git a/app/pods/components/huegasm-app/template.hbs b/app/pods/components/huegasm-app/template.hbs index a360f33..713e1b1 100644 --- a/app/pods/components/huegasm-app/template.hbs +++ b/app/pods/components/huegasm-app/template.hbs @@ -18,6 +18,6 @@ {{/if}} \ No newline at end of file diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index ec8fa93..91df417 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -44,7 +44,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { var picture = null; if(result.artwork_url){ - picture = result.artwork_url; + picture = result.artwork_url.replace('large', 't67x67'); } else if(result.user.avatar_url){ picture = result.user.avatar_url; } diff --git a/app/pods/components/music-tab/mixins/helpers.js b/app/pods/components/music-tab/mixins/helpers.js index 69777aa..54b6abc 100644 --- a/app/pods/components/music-tab/mixins/helpers.js +++ b/app/pods/components/music-tab/mixins/helpers.js @@ -138,6 +138,25 @@ export default Em.Mixin.create({ storage: null, firstVisit: true, + largeArtworkPic: function(){ + var pic = null, + currentVisName = this.get('currentVisName'), + usingMicAudio = this.get('usingMicAudio'), + playQueuePointer = this.get('playQueuePointer'), + playQueue = this.get('playQueue'); + + if(playQueuePointer !== -1 && !usingMicAudio && currentVisName === 'None'){ + var song = playQueue[playQueuePointer]; + if(song.scUrl){ + pic = song.picture.replace('67x67', '500x500'); + } else { + pic = song.picture; + } + } + + return pic; + }.property('playQueuePointer', 'usingMicAudio', 'currentVisName'), + // used to insure that we don't replay the same thing multiple times in shuffle mode shufflePlayed: [], pauseLightUpdates: function(){ diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index 435edad..3a4063b 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -1,7 +1,8 @@
- -
+ +
+
{{#if usingLocalAudio}} @@ -160,7 +161,7 @@
{{/if}} -
+
{{#paper-checkbox checked=flashingTransitions}}Flashing Transitions{{/paper-checkbox}} diff --git a/app/styles/app.scss b/app/styles/app.scss index 6b64bc0..6ab3b52 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1071,7 +1071,19 @@ div.ember-modal-dialog { } .displayIcon { - background:url(/favicon-96x96.png) center center no-repeat; + background: url(/favicon-96x96.png) center center no-repeat; + background-size: 80px 80px; +} + +#artwork { + position: absolute; + width: 100%; + overflow: hidden; + img { + display: block; + margin: 0 auto; + max-height: 400px; + } } .keyboard-arrow-down {