bug fixes
This commit is contained in:
parent
bb046134a1
commit
bd8171c928
4 changed files with 17 additions and 10 deletions
|
|
@ -19,7 +19,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
|
|||
this.set('currentVisName', name);
|
||||
},
|
||||
hideTooltip(){
|
||||
Em.$('.tooltip').remove();
|
||||
Em.$('.bootstrapTooltip').tooltip('hide');
|
||||
},
|
||||
gotoSCURL(URL){
|
||||
// need to pause the music since soundcloud is going to start playing this song anyways
|
||||
|
|
@ -589,15 +589,14 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
|
|||
},
|
||||
|
||||
simulateKick(mag, ratioKickMag) {
|
||||
console.log(mag + ',' + ratioKickMag);
|
||||
|
||||
var activeLights = this.get('activeLights'),
|
||||
lightsData = this.get('lightsData'),
|
||||
color = null,
|
||||
transitiontime = this.get('flashingTransitions'),
|
||||
stimulateLight = (light, brightness, hue) => {
|
||||
var options = {'bri': brightness};
|
||||
|
||||
if(this.get('flashingTransitions')) {
|
||||
if(transitiontime) {
|
||||
options['transitiontime'] = 0;
|
||||
} else {
|
||||
options['transitiontime'] = 1;
|
||||
|
|
@ -616,7 +615,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
|
|||
contentType: 'application/json',
|
||||
type: 'PUT'
|
||||
});
|
||||
};
|
||||
},
|
||||
timeToBriOff = 100;
|
||||
|
||||
if(activeLights.length > 0){
|
||||
var lastLightBopIndex = this.get('lastLightBopIndex'),
|
||||
|
|
@ -644,14 +644,18 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
|
|||
brightnessOnBeat /= 2;
|
||||
}
|
||||
|
||||
if(transitiontime){
|
||||
timeToBriOff = 80;
|
||||
}
|
||||
|
||||
stimulateLight(light, brightnessOnBeat, color);
|
||||
setTimeout(stimulateLight, 100, light, 1);
|
||||
setTimeout(stimulateLight, timeToBriOff, light, 1);
|
||||
}
|
||||
|
||||
this.set('paused', true);
|
||||
setTimeout(() => {
|
||||
this.set('paused', false);
|
||||
}, 100);
|
||||
}, 150);
|
||||
|
||||
//work the music beat area - simulate the speaker vibration by running a CSS animation on it
|
||||
Em.$('#beatSpeakerCenterOuter').removeClass('vibrateOuter').prop('offsetWidth', Em.$('#beatSpeakerCenterOuter').prop('offsetWidth')).addClass('vibrateOuter');
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ export default Em.Mixin.create({
|
|||
threshold: 0.3,
|
||||
micBoost: 5,
|
||||
oldThreshold: null,
|
||||
flashingTransitions: false,
|
||||
|
||||
playQueuePointer: -1,
|
||||
playQueue: Em.A(),
|
||||
|
|
@ -75,6 +74,9 @@ export default Em.Mixin.create({
|
|||
dimmerOn: false,
|
||||
isShowingAddSoundCloudModal: false,
|
||||
|
||||
colorloopMode: false,
|
||||
flashingTransitions: false,
|
||||
|
||||
SC_CLIENT_ID: 'aeec0034f58ecd85c2bd1deaecc41594',
|
||||
notFoundHtml: '<div class="alert alert-danger" role="alert">A microphone was not found.</div>',
|
||||
scUserNotSupportedHtml: '<div class="alert alert-danger" role="alert">SoundCloud user URLs are not supported.</div>',
|
||||
|
|
|
|||
|
|
@ -161,11 +161,11 @@
|
|||
{{/if}}
|
||||
|
||||
<div id="lightOption" class="beatOption col-xs-4">
|
||||
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Quickly flash the lights on beat" class="bootstrapTooltip">
|
||||
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Quickly flash the lights on beat" class="bootstrapTooltip" {{action "hideTooltip" on="mouseLeave"}}>
|
||||
{{#paper-checkbox checked=flashingTransitions}}Flashing Transitions{{/paper-checkbox}}
|
||||
</span>
|
||||
|
||||
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Slowly cycle the lights through all the colors while the music is playing" class="bootstrapTooltip">
|
||||
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Slowly cycle the lights through all the colors while the music is playing" class="bootstrapTooltip" {{action "hideTooltip" on="mouseLeave"}}>
|
||||
{{#paper-checkbox checked=colorloopMode}}Colorloop Mode{{/paper-checkbox}}
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -952,6 +952,7 @@ body.dimmerOn {
|
|||
.group.dimmerOn,
|
||||
.settings.dimmerOn,
|
||||
.mic.dimmerOn,
|
||||
.star.dimmerOn,
|
||||
.library-music.dimmerOn {
|
||||
color: inherit !important;
|
||||
text-shadow: $glowingText;
|
||||
|
|
|
|||
Reference in a new issue