Merge pull request #129 from MoodCat/fix/classify-timestamp

Now applies every second during classification to fix the timer. Fixes #114
MoodCat · Jun 25, 2015 · fd4edc1 · fd4edc1
2 parents a27270b + c284b50
commit fd4edc1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/scripts/controllers/classify/classifyController.js b/app/scripts/controllers/classify/classifyController.js
@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('moodCatApp')
-  .controller('ClassifyCtrl', ['$scope', '$element', '$compile', 'classifySongService', 'songs', 'currentSongService', '$timeout', '$rootScope',
-        function ($scope, $element, $compile, classifySongService, songs, currentSongService, $timeout, $rootScope) {
+  .controller('ClassifyCtrl', ['$scope', '$element', '$compile', 'classifySongService', 'songs', 'currentSongService', '$timeout', '$interval','$rootScope',
+        function ($scope, $element, $compile, classifySongService, songs, currentSongService, $timeout, $interval, $rootScope) {
 
             $scope.songs = songs;
 
@@ -32,9 +32,12 @@ angular.module('moodCatApp')
               $rootScope.song = song;
               $scope.feedbackSAM = true;
 
+              $rootScope.classifyUpdater = $interval($rootScope.$applyAsync(), 1000);
+
               timeout = $timeout(function() {
                   if($rootScope.sound) {
                       $rootScope.sound.stop();
+                      $interval.cancel($rootScope.classifyUpdater);
                   }
               }, duration);