jonathanhculver · August 29, 2015 13:57 · Mar 22, 2014 · Mar 22, 2014 · Mar 22, 2014 · Mar 22, 2014
diff --git a/playlist.js b/playlist.js
@@ -57,4 +57,6 @@ var playlistModule = (function() {
         removeTrack: removeTrack,
         addTrack: addTrack,
         shuffleTracks: shuffleTracks
-    };
+    };
+
+})();
diff --git a/playlist.js b/playlist.js
@@ -36,7 +36,6 @@ var playlistModule = (function() {
             tempArray.push(nextTrack);
             maxNum--;
         }
-
         return tempArray;
     }
 

diff --git a/playlist.js b/playlist.js
@@ -40,7 +40,7 @@ var playlistModule = (function() {
         return tempArray;
     }
 
-    /* utility methods */
+    /* private utility methods */
     var markPlayed = function(index) {
         shuffleArray.splice(index, 1);
     }

diff --git a/playlist.js b/playlist.js
@@ -38,7 +38,6 @@ var playlistModule = (function() {
         }
 
         return tempArray;
-
     }
 
     /* utility methods */
@@ -59,4 +58,4 @@ var playlistModule = (function() {
         removeTrack: removeTrack,
         addTrack: addTrack,
         shuffleTracks: shuffleTracks
-    };
+    };
diff --git a/playlist.js b/playlist.js
@@ -0,0 +1,62 @@
+var playlistModule = (function() {
+
+    /* private var */
+    var tracksArray = [],
+        shuffleArray = [];
+
+    /* public methods */
+    var addTrack = function(uri) {
+        tracksArray.push(uri);
+        return tracksArray;
+    }
+
+    var removeTrack = function(uri) {
+        var index = findTrackIndex(uri);
+        tracksArray.splice(index, 1);
+        return tracksArray;
+    }
+
+    var getTracks = function() {
+        return tracksArray;
+    }
+
+    var shuffleTracks = function() {
+        var tempArray = [];
+        var maxNum = tracksArray.length;
+
+        /* made a copy of the array */
+        shuffleArray = tracksArray.slice(0);
+
+        for(var i=0, max = tracksArray.length; i<max; i++) {
+
+            var randomNum = Math.floor(Math.random() * maxNum);
+            var nextTrack = shuffleArray[randomNum];
+
+            markPlayed(randomNum);
+            tempArray.push(nextTrack);
+            maxNum--;
+        }
+
+        return tempArray;
+
+    }
+
+    /* utility methods */
+    var markPlayed = function(index) {
+        shuffleArray.splice(index, 1);
+    }
+
+    var findTrackIndex = function(uri) {
+        for(var i = 0; i< tracksArray.length; i++) {
+            if(tracksArray[i] == uri) {
+                return i;
+            }
+        }
+    }
+    //only return methods we want public
+    return {
+        getTracks: getTracks,
+        removeTrack: removeTrack,
+        addTrack: addTrack,
+        shuffleTracks: shuffleTracks
+    };