add repeat track feat. closes #292

Soundnode · Sep 9, 2015 · f2e2c4b · f2e2c4b
1 parent 9484e64
commit f2e2c4b
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 161 deletions.
diff --git a/app/index.html b/app/index.html
@@ -159,9 +159,6 @@ <h4 id="playerUser" class="player_user"></h4>
                 <span class="player_duration" id="player-duration"></span>
             </div>
             <div class="player_controls">
-                <span class="player_shuffle" ng-click="shuffle($event)">
-                    <i class="fa fa-random thin"></i>
-                </span>
                 <span class="player_prevSong" ng-click="prevSong($event)">
                     <i class="fa fa-step-backward thin"></i>
                 </span>
@@ -172,6 +169,12 @@ <h4 id="playerUser" class="player_user"></h4>
                 <span class="player_nextSong" ng-click="nextSong($event)">
                     <i class="fa fa-step-forward thin"></i>
                 </span>
+                <span class="player_repeat" ng-click="repeat($event)">
+                    <i class="fa fa-repeat thin"></i>
+                </span>
+                <span class="player_shuffle" ng-click="shuffle($event)">
+                    <i class="fa fa-random thin"></i>
+                </span>
                 <span class="player_queueList" ng-click="toggleQueue($event)">
                     <i class="fa fa-list thin"></i>
                 </span>

diff --git a/app/public/js/common/playerService.js b/app/public/js/common/playerService.js
@@ -27,7 +27,8 @@ app.factory('playerService', function($rootScope, $log, $timeout, $window, $stat
 
     $rootScope.isSongPlaying = false;
     $rootScope.isPlaylistPlaying = false;
-    $rootScope.shuffle= false;
+    $rootScope.shuffle = false;
+    $rootScope.repeat = false;
 
     /**
      * Get a number between min index and max index
@@ -240,7 +241,7 @@ app.factory('playerService', function($rootScope, $log, $timeout, $window, $stat
     player.playPrevSong = function() {
         if ( $rootScope.shuffle ) {
             shuffle();
-        } else {
+        } else if ( ! $rootScope.repeat ) {
             queueService.prev();
         }
         this.playNewSong();
@@ -255,7 +256,7 @@ app.factory('playerService', function($rootScope, $log, $timeout, $window, $stat
     player.playNextSong = function() {
         if ( $rootScope.shuffle ) {
             shuffle();
-        } else {
+        } else if ( ! $rootScope.repeat ) {
             queueService.next();
         }
         this.playNewSong();

diff --git a/app/public/js/player/playerCtrl.js b/app/public/js/player/playerCtrl.js
@@ -60,6 +60,15 @@ app.controller('PlayerCtrl', function ($scope, $rootScope, playerService, hotkey
         }
     };
 
+    $scope.repeat = function($event) {
+        $event.currentTarget.classList.toggle('active');
+        if ( $rootScope.repeat ) {
+            $rootScope.repeat =  false;
+        } else {
+            $rootScope.repeat = true;
+        }
+    };
+
     $scope.shuffle = function($event) {
         $event.currentTarget.classList.toggle('active');
         if ( $rootScope.shuffle ) {