lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small bug fixes

Browse source
This commit is contained in:
lone-cloud 2015-10-25 23:29:24 -07:00
parent a28e718a5d
commit 6131932aa1
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/pods/components/music-tab/component.js
View file

@ -146,7 +146,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
this.send('removeAudio', playQueuePointer); this.send('removeAudio', playQueuePointer);
if(event.target.error.code){ if(event.target.error.code === 2){
this.get('notify').alert({html: this.get('failedToDecodeFileHtml')(song.fileName)}); this.get('notify').alert({html: this.get('failedToDecodeFileHtml')(song.fileName)});
} else { } else {
this.get('notify').alert({html: this.get('failedToPlayFileHtml')(song.fileName)}); this.get('notify').alert({html: this.get('failedToPlayFileHtml')(song.fileName)});
@ -170,13 +170,11 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
} }
if(scrollToSong){ if(scrollToSong){
var playListArea = Em.$('#playListArea');
// this is just a bad workaround to make sure that the track has been rendered to the playlist // this is just a bad workaround to make sure that the track has been rendered to the playlist
Em.run.later(()=>{ Em.run.later(()=>{
var track = Em.$('.track'+index); var track = Em.$('.track'+index), playListArea = Em.$('#playListArea');
if(!Em.isNone(track) && !Em.isNone(track.offset)) { if(!Em.isNone(track) && !Em.isNone(track.offset())) {
playListArea.animate({ playListArea.animate({
scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop() scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop()
}); });
@ -361,6 +359,9 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
this.set('audioMode', value); this.set('audioMode', value);
} }
}, },
playQueuePointerChanged(value){
this.send('goToSong', value, false, true);
},
clickSpeaker(){ clickSpeaker(){
this.simulateKick(1); this.simulateKick(1);
}, },
@ -393,7 +394,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
picture = "data:" + tags.picture.format + ";base64," + window.btoa(base64String); picture = "data:" + tags.picture.format + ";base64," + window.btoa(base64String);
} }
playQueue.pushObject({filename: this.name.replace(/\.[^/.]+$/, ""), url: URL.createObjectURL(this), artist: tags.artist, title: tags.title, picture: picture }); playQueue.pushObject({fileName: this.name.replace(/\.[^/.]+$/, ""), url: URL.createObjectURL(this), artist: tags.artist, title: tags.title, picture: picture, local: true });
ID3.clearAll(); ID3.clearAll();
@ -435,7 +436,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
saveSongBeatPreferences() { saveSongBeatPreferences() {
var song = this.get('playQueue')[this.get('playQueuePointer')], var song = this.get('playQueue')[this.get('playQueuePointer')],
title = Em.isEmpty(song.artist) ? song.filename : song.artist + '-' + song.title, title = Em.isEmpty(song.artist) ? song.fileName : song.artist + '-' + song.title,
songBeatPreferences = this.get('songBeatPreferences'); songBeatPreferences = this.get('songBeatPreferences');
songBeatPreferences[title] = {threshold: this.get('threshold'), interval: this.get('interval'), frequency: this.get('frequency') }; songBeatPreferences[title] = {threshold: this.get('threshold'), interval: this.get('interval'), frequency: this.get('frequency') };
@ -512,7 +513,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
title += (' - ' + song.artist); title += (' - ' + song.artist);
} }
} else { } else {
title = song.filename; title = song.fileName;
} }
title += '- Huegasm'; title += '- Huegasm';

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

@ -111,7 +111,7 @@
{{/if}} {{/if}}
</div> </div>
{{else}} {{else}}
{{item.filename}} {{item.fileName}}
{{/if}} {{/if}}
</div> </div>