From 0626a1e126cdc528e3814ebc314533680607f777 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 6 Nov 2015 00:31:39 -0800 Subject: [PATCH] bug fixes --- app/pods/components/music-tab/component.js | 18 ++++++++++++++---- .../components/music-tab/mixins/visualizer.js | 7 +++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index 934b58f..ec8fa93 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -216,7 +216,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { } }, play(replayPause) { - var dancer = this.get('dancer'), playQueuePointer = this.get('playQueuePointer'); + var dancer = this.get('dancer'), + playQueuePointer = this.get('playQueuePointer'); if(playQueuePointer !== -1 ) { if (this.get('playing')) { @@ -240,6 +241,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { return; } + Em.$(window).trigger('resize'); // workaround to redraw the canvas for the vitualizer + dancer.play(); } @@ -377,7 +380,10 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { micBoostChanged(value) { this.set('micBoost', value); this.get('storage').set('huegasm.micBoost', value); - this.get('dancer').setBoost(value); + + if(this.get('usingMicAudio')) { + this.get('dancer').setBoost(value); + } }, audioModeChanged(value){ if(value === 1) { @@ -394,12 +400,12 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { clickSpeaker(){ this.simulateKick(1); }, - dropFiles(){ + dropFiles(files){ this.setProperties({ dragging: false, draggingOverPlayListArea: false }); - this.send('handleNewFiles', event.dataTransfer.files); + this.send('handleNewFiles', files); }, playListAreaDragOver(){ this.set('draggingOverPlayListArea', true); @@ -733,6 +739,10 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { } }); + this.$().on('drop', '#playListArea', (event)=>{ + this.send('dropFiles', event.dataTransfer.files); + }); + // control the volume by scrolling up/down Em.$('#playerArea').on('mousewheel', (event)=>{ if(this.get('playQueueNotEmpty') && !this.get('usingMicAudio')) { diff --git a/app/pods/components/music-tab/mixins/visualizer.js b/app/pods/components/music-tab/mixins/visualizer.js index ea958e4..98ac505 100644 --- a/app/pods/components/music-tab/mixins/visualizer.js +++ b/app/pods/components/music-tab/mixins/visualizer.js @@ -24,7 +24,7 @@ export default Em.Mixin.create({ playerArea = Em.$('#playerArea'), ctx = canvas.getContext('2d'), spacing = 2, - h = Em.$('#playerArea').height(), w; + h = playerArea.height(), w; canvas.height = h; @@ -45,7 +45,7 @@ export default Em.Mixin.create({ pageHidden = document.hidden || document.msHidden || document.webkitHidden || document.mozHidden; // dont do anything if the page is hidden or no visualization - if(currentVisName === 'None' || pageHidden){ + if(currentVisName === 'None' || pageHidden || !this.get('active')){ return; } @@ -85,5 +85,4 @@ export default Em.Mixin.create({ } }); } -}) -; +});