From 6131932aa1c1498e2b1cbaf44976564c0d65b110 Mon Sep 17 00:00:00 2001
From: lone-cloud <lonecloud604@pm.me>
Date: Sun, 25 Oct 2015 23:29:24 -0700
Subject: [PATCH] small bug fixes

---
 app/pods/components/music-tab/component.js | 17 +++++++++--------
 app/pods/components/music-tab/template.hbs |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index ded2570..8af0a03 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -146,7 +146,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
 
           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)});
           } else {
             this.get('notify').alert({html: this.get('failedToPlayFileHtml')(song.fileName)});
@@ -170,13 +170,11 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
         }
 
         if(scrollToSong){
-          var playListArea = Em.$('#playListArea');
-
           // this is just a bad workaround to make sure that the track has been rendered to the playlist
           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({
                 scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop()
               });
@@ -361,6 +359,9 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
         this.set('audioMode', value);
       }
     },
+    playQueuePointerChanged(value){
+      this.send('goToSong', value, false, true);
+    },
     clickSpeaker(){
       this.simulateKick(1);
     },
@@ -393,7 +394,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
             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();
 
@@ -435,7 +436,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
 
   saveSongBeatPreferences() {
     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[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);
         }
       } else {
-        title = song.filename;
+        title = song.fileName;
       }
 
       title += '- Huegasm';
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index e30e9fc..bb16e82 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -111,7 +111,7 @@
             {{/if}}
           </div>
         {{else}}
-          {{item.filename}}
+          {{item.fileName}}
         {{/if}}
       </div>