diff --git a/assets/js/controllers/queue.controller.js b/assets/js/controllers/queue.controller.js index 06fd66e..c752d3c 100644 --- a/assets/js/controllers/queue.controller.js +++ b/assets/js/controllers/queue.controller.js @@ -1,10 +1,10 @@ -mpdClient.controller('queue', function ($rootScope, $scope, $resource, serverEvents) { +mpdClient.controller('queue', function ($scope, $resource, serverEvents) { var Queue = $resource('/api/queue') - $rootScope.queueSongs = Queue.query() + $scope.queueSongs = Queue.query() $scope.updateQueue = function(data) { - $rootScope.queueSongs = data + $scope.queueSongs = data } serverEvents.onUpdateQueue($scope.updateQueue) diff --git a/assets/js/controllers/transport.controller.js b/assets/js/controllers/transport.controller.js index d3b337f..d9fb06e 100644 --- a/assets/js/controllers/transport.controller.js +++ b/assets/js/controllers/transport.controller.js @@ -1,20 +1,20 @@ -mpdClient.controller('transport', function ($rootScope, $scope, $http, serverEvents) { +mpdClient.controller('transport', function ($scope, $http, serverEvents) { var Status = $http({ method: 'GET', url: '/api/status' }) - $rootScope.status = {} + $scope.status = {} Status.success(function (data, status, headers, config) { $scope.updateStatus(data) }) $scope.updateStatus = function(data) { - $rootScope.status = data + $scope.status = data if (data.time) { $scope.updateTime(data.time) } } $scope.updateTime = function(data) { - $rootScope.elapsedTime = data[0] - $rootScope.totalTime = data[1] + $scope.elapsedTime = data[0] + $scope.totalTime = data[1] } $scope.sendCommand = function (command) { diff --git a/views/index.erb b/views/index.erb index 044eee0..efe3c5a 100644 --- a/views/index.erb +++ b/views/index.erb @@ -28,6 +28,7 @@