bug fixes and small styling changes
This commit is contained in:
parent
1a9461d619
commit
d80e710b1b
4 changed files with 23 additions and 10 deletions
|
|
@ -3,7 +3,7 @@ import Em from 'ember';
|
|||
export default Em.Component.extend({
|
||||
dancer: null,
|
||||
|
||||
classNames: ['container-fluid'],
|
||||
classNames: ['container-fluid', 'innerControlFrame'],
|
||||
|
||||
beatOptions: {
|
||||
threshold: {
|
||||
|
|
@ -285,7 +285,7 @@ export default Em.Component.extend({
|
|||
init: function () {
|
||||
this._super();
|
||||
|
||||
var dancer = new Dancer(),
|
||||
var dancer = window.dancer || new Dancer(),
|
||||
self = this,
|
||||
threshold = this.get('threshold'),
|
||||
decay = this.get('decay'),
|
||||
|
|
@ -334,6 +334,7 @@ export default Em.Component.extend({
|
|||
self.set('timeTotal', dancer.audio.duration);
|
||||
});
|
||||
|
||||
window.dancer = dancer;
|
||||
this.setProperties({
|
||||
dancer: dancer,
|
||||
kick: kick
|
||||
|
|
@ -387,5 +388,12 @@ export default Em.Component.extend({
|
|||
});
|
||||
|
||||
Em.$('[data-toggle="tooltip"]').tooltip();
|
||||
},
|
||||
|
||||
// component clean up
|
||||
destroy: function(){
|
||||
//this.get('dancer').audioAdapter.context.close();
|
||||
this.get('dancer').unbind('loaded');
|
||||
this._super();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ $playListBackgroundColor: #1E1E1E;
|
|||
$playerDefaultIconColor: #BBBBBB;
|
||||
|
||||
// BRIDGE FINDER
|
||||
.footerFixed {
|
||||
position: static !important;
|
||||
}
|
||||
|
||||
.footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
|
|
@ -171,7 +175,7 @@ md-toolbar {
|
|||
}
|
||||
|
||||
.innerControlFrame {
|
||||
height: 100vh;
|
||||
height: 80vh;
|
||||
}
|
||||
|
||||
// GROUP CONTROL
|
||||
|
|
@ -274,6 +278,8 @@ md-toolbar {
|
|||
#playlist {
|
||||
height: $playerHeight;
|
||||
background-color: $playListBackgroundColor;
|
||||
padding-left: 0.625em;
|
||||
padding-right: 0.625em;
|
||||
}
|
||||
|
||||
#playerArea * .noUi-origin {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{{#if ready}}
|
||||
|
||||
{{#paper-nav-container class="ember-app"}}
|
||||
|
||||
{{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true locked-open="lg"}}
|
||||
|
|
@ -25,7 +24,7 @@
|
|||
{{#liquid-if musicTabSelected class="tabSwitch"}}
|
||||
{{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
|
||||
{{/liquid-if}}
|
||||
{{huegasm-footer}}
|
||||
{{huegasm-footer classNames="footerFixed"}}
|
||||
{{/paper-content}}
|
||||
{{/paper-nav-container}}
|
||||
{{/if}}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
{{#if nextPrevEnabled}}
|
||||
<span data-toggle="tooltip" data-placement="top" title="Previous"
|
||||
id="prevTooltip" {{action "previous"}}>{{paper-icon icon="skip-previous" class="playerControllIcon"}} </span>{{/if}}<!--
|
||||
id="prevTooltip" {{action "previous"}}>{{paper-icon icon="skip-previous" class="playerControllIcon"}}</span>{{/if}}<!--
|
||||
--><span data-toggle="tooltip" data-placement="top"
|
||||
title={{playingTooltipTxt}} id="playingTooltip" {{action "play"}}>{{paper-icon icon=playingIcon class="playerControllIcon"}}</span><!--
|
||||
-->{{#if nextPrevEnabled}}
|
||||
<span data-toggle="tooltip" data-placement="top"
|
||||
title="Next song" {{action "next"}}>{{paper-icon icon="skip-next" action="" class="playerControllIcon"}}</span>
|
||||
{{/if}}<!--
|
||||
-->{{#if nextPrevEnabled}}<!--
|
||||
--><span data-toggle="tooltip" data-placement="top"
|
||||
title="Next song" {{action "next"}}>{{paper-icon icon="skip-next" action="" class="playerControllIcon"}}</span><!--
|
||||
-->{{/if}}<!--
|
||||
--><span data-toggle="tooltip" data-placement="top"
|
||||
title={{volumeMutedTooltipTxt}} id="volumeMutedTooltip" {{action "volumeMutedChanged"}}>{{paper-icon icon=volumeClass class="playerControllIcon volumeButton"}}</span><!--
|
||||
-->{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volumeBar"}}
|
||||
|
|
|
|||
Reference in a new issue