From 2c2e9776b7bb34a7a9d51a0d212752a15b9d47d2 Mon Sep 17 00:00:00 2001
From: Nick Steel <kingosticks@gmail.com>
Date: Sun, 12 Apr 2015 18:10:09 +0100
Subject: [PATCH] Consolidate common code into getNowPlayingTlid.

---
 .../static/js/controls.js                     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 02364cb..c8d2d7e 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -1,3 +1,15 @@
+/********************************************************
+ * Return TrackList ID for the currently playing track.
+ *********************************************************/
+function getNowPlayingTlid() {
+	for (var playing = 0; playing < currentplaylist.length; playing++) {
+		if (currentplaylist[playing].uri == songdata.uri) {
+			break;
+		}
+	}
+	return playing;
+}
+
 /********************************************************
  * play tracks from a browse list
  *********************************************************/
@@ -23,12 +35,7 @@ function playBrowsedTracks(addtoqueue, trackid) {
         switch (addtoqueue) {
             case PLAY_NOW:
             case PLAY_NEXT:
-                //find track that is playing
-                for (var playing = 0; playing < currentplaylist.length; playing++) {
-                    if (currentplaylist[playing].uri == songdata.uri) {
-                        break;
-                    }
-                }
+                var playing = getNowPlayingTlid();
                 mopidy.tracklist.add(null, playing + 1, trackid);
                 break;
             case ADD_THIS_BOTTOM:
@@ -112,6 +119,7 @@ function playTrack(addtoqueue) {
     var trackslist = new Array();
     var track, tracksbefore, tracksafter;
     var tracks = getTracksFromUri(playlisturi);
+    var playing = getNowPlayingTlid();
 
     //find track that was selected
     for (var selected = 0; selected < tracks.length; selected++) {
@@ -120,13 +128,6 @@ function playTrack(addtoqueue) {
         }
     }
 
-    //find track that is playing
-    for (var playing = 0; playing < currentplaylist.length; playing++) {
-        if (currentplaylist[playing].tlid == songdata.tlid) {
-            break;
-        }
-    }
-
     //switch popup options
     switch (addtoqueue) {
         case PLAY_NOW: