From b22ddcbf5c774b24d3af610f536d1cc90c27ade1 Mon Sep 17 00:00:00 2001 From: Maximilian Walter Date: Thu, 2 Jun 2016 15:59:39 +0200 Subject: [PATCH] removed: unused code after playlist filter implementation --- .../assets/scripts/app/controllers/playlists-list.coffee | 7 ++++++- resources/assets/scripts/app/controllers/playlists.coffee | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/assets/scripts/app/controllers/playlists-list.coffee b/resources/assets/scripts/app/controllers/playlists-list.coffee index 9aca00fa..44076453 100644 --- a/resources/assets/scripts/app/controllers/playlists-list.coffee +++ b/resources/assets/scripts/app/controllers/playlists-list.coffee @@ -17,7 +17,12 @@ window.pfm.preloaders['playlists-list'] = [ 'playlists', '$state' (playlists, $state) -> - playlists.fetchList($state.params.page, true) + playlists.loadFilters().then(-> + playlists.mainQuery.fromFilterString($state.params.filter) + playlists.mainQuery.setPage $state.params.page || 1 + + playlists.mainQuery.fetch() + ) ] module.exports = angular.module('ponyfm').controller "playlists-list", [ diff --git a/resources/assets/scripts/app/controllers/playlists.coffee b/resources/assets/scripts/app/controllers/playlists.coffee index 64e405a5..bba00a2f 100644 --- a/resources/assets/scripts/app/controllers/playlists.coffee +++ b/resources/assets/scripts/app/controllers/playlists.coffee @@ -23,8 +23,6 @@ window.pfm.preloaders['playlists'] = [ module.exports = angular.module('ponyfm').controller "playlists", [ '$scope', 'playlists', '$state' ($scope, playlists, $state) -> - # ToDo: Move this function back to preloaders, as soon as I figured out how they work - playlists.loadFilters() $scope.query = playlists.mainQuery $scope.filters = playlists.filters